Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 450ae41

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

Change-Id: Ic176a1179810ed6445825dff073c0cd55b478724
This commit is contained in:
Adam Lesinski
2016-04-07 00:50:38 +00:00
committed by android-build-merger
parent 7b6b6e4f46 450ae41c54
commit 92a14b851f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -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"];