commit 6b17d2cec2cc3bd97c684b7da490e3f6eab0d980
author Adam Lesinski <adamlesinski@google.com> Wed Aug 10 11:37:06 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Aug 10 11:37:06 2016 -0700
tree 72626745ff87b0a28cfed85c4cead47ac3070886
parent 18f4bd887fe7de4b5024316fe5df53034bc4f2d1

AAPT2: Parse coreApp in <manifest> as boolean

Bug:30751662
Change-Id: I283be5725426ee084944c1921df40d1bd6188028

tools/aapt2/link/XmlReferenceLinker.cpp

diff --git a/tools/aapt2/link/XmlReferenceLinker.cpp b/tools/aapt2/link/XmlReferenceLinker.cpp
index 02af5e3..a29d8dc 100644
--- a/tools/aapt2/link/XmlReferenceLinker.cpp
+++ b/tools/aapt2/link/XmlReferenceLinker.cpp
@@ -126,8 +126,9 @@
                     mError = true;
 
                 }
-            } else {
-                // We still encode references.
+            } else if (!attr.compiledValue) {
+                // We still encode references, but only if we haven't manually set this to
+                // another compiled value.
                 attr.compiledValue = ResourceUtils::tryParseReference(attr.value);
             }