commit fee32d4d5f281504d3cc319e9833853ae0b23263
author Adam Lesinski <adamlesinski@google.com> Tue May 31 15:07:20 2016 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Jun 02 23:57:55 2016 +0000
tree 1482e7ebc120d90642c898d8a0e9109bcdad8022
parent 0f19009fb7daa5e03c29f4c853e3798b4f38661e

Allow uses-library under <application>

Bug:29106952
Change-Id: I2e780323d86e7050038d34426a30e66a4bbfcc23

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index 953e87e..77a949f 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -180,7 +180,6 @@
 
     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 @@
     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;