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 
am: c878fb0cb8

* commit 'c878fb0cb8a901aae71d965a57e75e682eb6f67f':
  Allow uses-library under <application>

Change-Id: Iaa1f6acb21ec2426a9b8e935efd71cd877bed667
This commit is contained in:
Adam Lesinski
2016-06-03 00:38:23 +00:00
committed by android-build-merger
parent 0f4ae5e1a6 c878fb0cb8
commit b80680af78
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-feature"];
manifestAction[u"uses-library"];
manifestAction[u"supports-screens"];
manifestAction[u"compatible-screens"];
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"];
applicationAction.action(optionalNameIsJavaClassName);
// Uses library actions.
applicationAction[u"uses-library"];
// Activity actions.
applicationAction[u"activity"].action(requiredNameIsJavaClassName);
applicationAction[u"activity"][u"intent-filter"] = intentFilterAction;