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

AAPT2: Add the rest of supported manifest elements

Browse Source 
Adds elemnts that are parsed in PackageParser to the manifest parsing of
AAPT2.

<package> found in <manifest>
<preferred> found in <manifest><application><activity>

Bug: 79755007
Test: manual building of broken targets listed in the bug
Change-Id: Ic7d17e62d04aa46757d2ed7482ec0aff93ce9ee5
Merged-In: Ic7d17e62d04aa46757d2ed7482ec0aff93ce9ee5
(cherry picked from commit 28afe682cd)
This commit is contained in:
Ryan Mitchell
2018-09-07 14:33:14 -07:00
committed by Colin Cross
parent 48d009ad32
commit 00d5548355
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,6 +252,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
xml::XmlNodeAction component_action; xml::XmlNodeAction component_action;
component_action.Action(RequiredNameIsJavaClassName); component_action.Action(RequiredNameIsJavaClassName);
component_action["intent-filter"] = intent_filter_action; component_action["intent-filter"] = intent_filter_action;
component_action["preferred"] = intent_filter_action;
component_action["meta-data"] = meta_data_action; component_action["meta-data"] = meta_data_action;
// Manifest actions. // Manifest actions.
@@ -403,6 +404,8 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
application_action["provider"]["grant-uri-permission"]; application_action["provider"]["grant-uri-permission"];
application_action["provider"]["path-permission"]; application_action["provider"]["path-permission"];
manifest_action["package"] = manifest_action;
return true; return true;
} }