commit 24b8ff0faf7c59323d0171cdd825ca09e712aa1e
author Adam Lesinski <adamlesinski@google.com> Wed Dec 16 14:01:57 2015 -0800
committer Adam Lesinski <adamlesinski@google.com> Thu Dec 17 11:01:55 2015 -0800
tree f1350009e8e3aa03ab93b088619635991aeb989a
parent 7ff3ee19f4b831a526baf4b928d1ac172d070d82

AAPT2: Fix references to private parent

Change-Id: Id4697551b6c8cb6167f562de593006ae3c6158c0

tools/aapt2/unflatten/BinaryResourceParser.cpp

diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index 21e476f..6b7a63cf 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -585,6 +585,13 @@
                 source.path = path.toString();
             }
             source.line = util::deviceToHost32(sourceBlock->line);
+
+            if (Style* style = valueCast<Style>(resourceValue.get())) {
+                // The parent's source is the same as the resource itself, set it here.
+                if (style->parent) {
+                    style->parent.value().setSource(source);
+                }
+            }
         }
 
         StringPiece16 comment = util::getString(mSourcePool,