commit cf5326fae1da55b9050834bb63bfa264a6d2af60
author Alan Viverette <alanv@google.com> Fri Jan 05 16:03:50 2018 -0500
committer Alan Viverette <alanv@google.com> Fri Jan 05 16:04:33 2018 -0500
tree d71de994bad2da27695f001ffc74d486871084fc
parent 0ff8dabf2c258389ee6a633b4c7f99477b63071a

Allow <adopt-permissions> tag in manifest

Change-Id: Ib595ab84da3a68e6a72f203ee51e3c86c7a3a3d1
Fixes: 71640901
Test: migrate GoogleServicesFramework to AAPT2, build

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index ccc3470..713db5b 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -319,6 +319,7 @@
   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"];