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

Commit 85ee0546 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Allow <protected-broadcast> and <eat-comment> in... 

Merge "AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml" into nyc-dev am: 450ae41c
am: 92a14b85

* commit '92a14b85':
  AAPT2: Allow <protected-broadcast> and <eat-comment> in AndroidManifest.xml

Change-Id: I1c51ffb1593aa8ff44f0c4264f32d82a332e0208
parents 7832b64b 92a14b85

tools/aapt2/link/ManifestFixer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ bool ManifestFixer::buildRules(xml::XmlActionExecutor* executor, IDiagnostics* d 
        return true;

    });



    manifestAction[u"eat-comment"];

    manifestAction[u"protected-broadcast"];

    manifestAction[u"uses-permission"];

    manifestAction[u"permission"];

    manifestAction[u"permission-tree"];