commit c903d2e7cdc74bd0573ecfb5f5dd35ee7c90249e
author Mårten Kongstad <marten.kongstad@sony.com> Fri Dec 09 00:23:41 2016 +0100
committer Mårten Kongstad <marten.kongstad@sony.com> Thu Aug 31 14:50:10 2017 +0200
tree 067392c1c9a041c0366a8bcecdc75224eb4872b8
parent f08ad98acbb83abf7d30b6583bdfc188145a4215

AAPT2: Allow <overlay> in AndroidManifest.xml

Test: libaapt2_tests
Test: manual (build an overlay package)
Change-Id: I96b7340a53a7d4f1ca022065674fbf5bdaa273f2

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 53c66a6..f0ac467 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -293,6 +293,7 @@
   manifest_action["instrumentation"]["meta-data"] = meta_data_action;
 
   manifest_action["original-package"];
+  manifest_action["overlay"];
   manifest_action["protected-broadcast"];
   manifest_action["uses-permission"];
   manifest_action["uses-permission-sdk-23"];