From 5f7c461be69b549e00c778dcb3a417dffc96e220 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Fri, 12 Feb 2016 23:38:08 -0800 Subject: [PATCH] AAPT2: Fix source output when error occurs in style We were serializing the wrong Source when writing to protobuf Change-Id: Ib65e962ebc1244ddf4af0e5666aaaebe5f7864a8 --- tools/aapt2/proto/TableProtoSerializer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/aapt2/proto/TableProtoSerializer.cpp b/tools/aapt2/proto/TableProtoSerializer.cpp index bba2da42c6661..b3d87d805c6dd 100644 --- a/tools/aapt2/proto/TableProtoSerializer.cpp +++ b/tools/aapt2/proto/TableProtoSerializer.cpp @@ -111,7 +111,7 @@ public: serializeReferenceToPb(entry.key, pbEntry->mutable_key()); pb::Item* pbItem = pbEntry->mutable_item(); - serializeItemCommonToPb(*entry.value, pbEntry); + serializeItemCommonToPb(entry.key, pbEntry); PbSerializerVisitor subVisitor(mSourcePool, mSymbolPool, pbItem); entry.value->accept(&subVisitor); }