commit 87f1e0fd31585e0117715f451c379d25c5ef7cb8
author Adam Lesinski <adamlesinski@google.com> Tue Jun 27 16:21:58 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Wed Jun 28 10:27:06 2017 -0700
tree 2d9164d349d9ac623d26da21c680e131336d7611
parent f3833d4ba05d47ee6b1a943b49a0769ea879cc8c

AAPT2: Allow <key-sets> tags in AndroidManifest.xml

Bug: 62839863
Test: make aapt2_tests
Change-Id: Ic38fadf3b204bf603f6770643735635cd1f1df7e

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 99fd95b..a0ffefa 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -309,6 +309,9 @@
   manifest_action["meta-data"] = meta_data_action;
   manifest_action["uses-split"].Action(RequiredNameIsJavaPackage);
 
+  manifest_action["key-sets"]["key-set"]["public-key"];
+  manifest_action["key-sets"]["upgrade-key-set"];
+
   // Application actions.
   xml::XmlNodeAction& application_action = manifest_action["application"];
   application_action.Action(OptionalNameIsJavaClassName);