From c728c3daba5754467ef0c42a83247fdb4be1a4db Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Wed, 6 Apr 2016 17:40:25 -0700 Subject: [PATCH] AAPT2: Allow and in AndroidManifest.xml Change-Id: I38c49a2a31e560dec963d44d94e067035fd59150 --- tools/aapt2/link/ManifestFixer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp index b9946649e4f0d..3779638590be0 100644 --- a/tools/aapt2/link/ManifestFixer.cpp +++ b/tools/aapt2/link/ManifestFixer.cpp @@ -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"];