From 48d009ad321efff9e3b43e1f5fc7477dc78a3ae4 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Wed, 25 Jul 2018 16:15:17 -0700 Subject: [PATCH] AAPT2: Add supported manifest elements Adds some elements present in res/values/attrs_manifest.xml to manifest parsing. in in in in Bug: 79755007 Test: manual Change-Id: I50520a99ce5ced9908001430b2108d7a5c71f8a7 Merged-In: I50520a99ce5ced9908001430b2108d7a5c71f8a7 (cherry picked from commit 66f6cfb8a561a653db084b97adfa8c4d48979000) --- tools/aapt2/link/ManifestFixer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp index ee4e70288994..08e6ed3ab08e 100644 --- a/tools/aapt2/link/ManifestFixer.cpp +++ b/tools/aapt2/link/ManifestFixer.cpp @@ -346,6 +346,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 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"]; @@ -355,6 +356,8 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 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); @@ -376,6 +379,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 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 { -- 2.11.0