commit ed72380fac1145a53395dbba8cb9969967a04f2f
author Ryan Mitchell <rtmitchell@google.com> Thu Aug 23 21:45:53 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 23 21:45:53 2018 +0000
tree cc9a116e16fbd8a831d693d22891620d1f60bb18
parent 9ac32b99ec57f98124d001eeec3dbb7451fb4088
parent 66f6cfb8a561a653db084b97adfa8c4d48979000

Merge "AAPT2: Add supported manifest elements"

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 55a32c8..c5c78d9 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -357,6 +357,7 @@
   manifest_action["uses-permission"];
   manifest_action["uses-permission-sdk-23"];
   manifest_action["permission"];
+  manifest_action["permission"]["meta-data"] = meta_data_action;
   manifest_action["permission-tree"];
   manifest_action["permission-group"];
   manifest_action["uses-configuration"];
@@ -366,6 +367,8 @@
   manifest_action["compatible-screens"];
   manifest_action["compatible-screens"]["screen"];
   manifest_action["supports-gl-texture"];
+  manifest_action["restrict-update"];
+  manifest_action["package-verifier"];
   manifest_action["meta-data"] = meta_data_action;
   manifest_action["uses-split"].Action(RequiredNameIsJavaPackage);
 
@@ -387,6 +390,7 @@
   uses_static_library_action.Action(RequiredNameIsJavaPackage);
   uses_static_library_action.Action(RequiredAndroidAttribute("version"));
   uses_static_library_action.Action(RequiredAndroidAttribute("certDigest"));
+  uses_static_library_action["additional-certificate"];
 
   if (options_.debug_mode) {
     application_action.Action([&](xml::Element* el) -> bool {