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

Merge "Allow uses-library under <application>" into nyc-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2016-06-03 00:31:36 +00:00
committed by Android (Google) Code Review
parent 67f82d16ea fee32d4d5f
commit c878fb0cb8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,7 +180,6 @@ bool ManifestFixer::buildRules(xml::XmlActionExecutor* executor, IDiagnostics* d
manifestAction[u"uses-configuration"]; manifestAction[u"uses-configuration"];
manifestAction[u"uses-feature"]; manifestAction[u"uses-feature"];
manifestAction[u"uses-library"];
manifestAction[u"supports-screens"]; manifestAction[u"supports-screens"];
manifestAction[u"compatible-screens"]; manifestAction[u"compatible-screens"];
manifestAction[u"supports-gl-texture"]; manifestAction[u"supports-gl-texture"];
@@ -189,6 +188,9 @@ bool ManifestFixer::buildRules(xml::XmlActionExecutor* executor, IDiagnostics* d
xml::XmlNodeAction& applicationAction = (*executor)[u"manifest"][u"application"]; xml::XmlNodeAction& applicationAction = (*executor)[u"manifest"][u"application"];
applicationAction.action(optionalNameIsJavaClassName); applicationAction.action(optionalNameIsJavaClassName);
// Uses library actions.
applicationAction[u"uses-library"];
// Activity actions. // Activity actions.
applicationAction[u"activity"].action(requiredNameIsJavaClassName); applicationAction[u"activity"].action(requiredNameIsJavaClassName);
applicationAction[u"activity"][u"intent-filter"] = intentFilterAction; applicationAction[u"activity"][u"intent-filter"] = intentFilterAction;