Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Add supported manifest elements

Browse Source 
am: 48d009ad32

Change-Id: Ib620e6c3a5ee6b4a33f4d64a9afa44302de67d7a
This commit is contained in:
Ryan Mitchell
2018-10-10 16:00:02 -07:00
committed by android-build-merger
parent 64106e4399 48d009ad32
commit 840beebdb4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -346,6 +346,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
manifest_action["uses-permission"]; manifest_action["uses-permission"];
manifest_action["uses-permission-sdk-23"]; manifest_action["uses-permission-sdk-23"];
manifest_action["permission"]; manifest_action["permission"];
manifest_action["permission"]["meta-data"] = meta_data_action;
manifest_action["permission-tree"]; manifest_action["permission-tree"];
manifest_action["permission-group"]; manifest_action["permission-group"];
manifest_action["uses-configuration"]; manifest_action["uses-configuration"];
@@ -355,6 +356,8 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
manifest_action["compatible-screens"]; manifest_action["compatible-screens"];
manifest_action["compatible-screens"]["screen"]; manifest_action["compatible-screens"]["screen"];
manifest_action["supports-gl-texture"]; manifest_action["supports-gl-texture"];
manifest_action["restrict-update"];
manifest_action["package-verifier"];
manifest_action["meta-data"] = meta_data_action; manifest_action["meta-data"] = meta_data_action;
manifest_action["uses-split"].Action(RequiredNameIsJavaPackage); 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(RequiredNameIsJavaPackage);
uses_static_library_action.Action(RequiredAndroidAttribute("version")); uses_static_library_action.Action(RequiredAndroidAttribute("version"));
uses_static_library_action.Action(RequiredAndroidAttribute("certDigest")); uses_static_library_action.Action(RequiredAndroidAttribute("certDigest"));
uses_static_library_action["additional-certificate"];
if (options_.debug_mode) { if (options_.debug_mode) {
application_action.Action([&](xml::Element* el) -> bool { application_action.Action([&](xml::Element* el) -> bool {