commit 9046d82b8f6251508942aa74765a41118084f3f9
author Philip P. Moltmann <moltmann@google.com> Fri Dec 13 15:59:49 2019 -0800
committer Philip P. Moltmann <moltmann@google.com> Fri Jan 03 10:08:03 2020 -0800
tree e8a89469ae4d0eff858459f4da2a8e4d69e391fe
parent 2bf1ce3d14b39d22a412602808c7297105e3ff7f

Allow apps to define featureIds in the manifest

Test: CtsAppOpsTestCases (with newly added test for featureIds declared
      in manifest)
Bug: 144997947
Change-Id: I5563ae6861318e4cc1d196e3f6aea378a4dcf748

tools/aapt2/link/ManifestFixer.cpp

diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp
index b725920..27960c8 100644
--- a/tools/aapt2/link/ManifestFixer.cpp
+++ b/tools/aapt2/link/ManifestFixer.cpp
@@ -365,6 +365,8 @@
   });
   manifest_action["instrumentation"]["meta-data"] = meta_data_action;
 
+  manifest_action["feature"];
+  manifest_action["feature"]["inherit-from"];
   manifest_action["original-package"];
   manifest_action["overlay"];
   manifest_action["protected-broadcast"];