Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c878fb0c authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

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

parents 67f82d16 fee32d4d

tools/aapt2/link/ManifestFixer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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;