diff options
| author | 2018-08-23 21:45:53 +0000 | |
|---|---|---|
| committer | 2018-08-23 21:45:53 +0000 | |
| commit | ed72380fac1145a53395dbba8cb9969967a04f2f (patch) | |
| tree | cc9a116e16fbd8a831d693d22891620d1f60bb18 | |
| parent | 9ac32b99ec57f98124d001eeec3dbb7451fb4088 (diff) | |
| parent | 66f6cfb8a561a653db084b97adfa8c4d48979000 (diff) | |
Merge "AAPT2: Add supported manifest elements"
| -rw-r--r-- | tools/aapt2/link/ManifestFixer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp index 55a32c8b512c..c5c78d9d3827 100644 --- a/tools/aapt2/link/ManifestFixer.cpp +++ b/tools/aapt2/link/ManifestFixer.cpp @@ -357,6 +357,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"]; @@ -366,6 +367,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); @@ -387,6 +390,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 { |