commit a6fe345be955368a13aea76aefb4db821aad11df
author Adam Lesinski <adamlesinski@google.com> Wed Dec 09 15:20:52 2015 -0800
committer Adam Lesinski <adamlesinski@google.com> Thu Dec 10 16:24:15 2015 -0800
tree c5385f798a6e1fb674f6f13c0f323726258618ca
parent 01655232371d7c7ea5b58ccf66ad99917072018a

AAPT2: Fix overlay support

Supports the <add-resource> tag and mimics old AAPT behavior of
not allowing new resources defined unless <add-resource> was used
or --auto-add-overlay was specified.

Change-Id: I9b461137357617ade37fd7045b418b8e6450b9c4

tools/aapt2/unflatten/BinaryResourceParser.cpp

diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp
index 46b5205..21e476f 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.cpp
+++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp
@@ -447,6 +447,10 @@
         case Public_entry::kPublic:
             symbol.state = SymbolState::kPublic;
             break;
+
+        case Public_entry::kUndefined:
+            symbol.state = SymbolState::kUndefined;
+            break;
         }
 
         if (!mTable->setSymbolStateAllowMangled(name, resId, symbol, mContext->getDiagnostics())) {