summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2018-01-05 16:03:50 -0500
committer Alan Viverette <alanv@google.com> 2018-01-05 16:04:33 -0500
commitcf5326fae1da55b9050834bb63bfa264a6d2af60 (patch)
treed71de994bad2da27695f001ffc74d486871084fc
parent0ff8dabf2c258389ee6a633b4c7f99477b63071a (diff)
Allow <adopt-permissions> tag in manifest
Change-Id: Ib595ab84da3a68e6a72f203ee51e3c86c7a3a3d1 Fixes: 71640901 Test: migrate GoogleServicesFramework to AAPT2, build
-rw-r--r--tools/aapt2/link/ManifestFixer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index ccc3470fd7f4..713db5b7ed86 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -319,6 +319,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
manifest_action["original-package"];
manifest_action["overlay"];
manifest_action["protected-broadcast"];
+ manifest_action["adopt-permissions"];
manifest_action["uses-permission"];
manifest_action["uses-permission-sdk-23"];
manifest_action["permission"];