Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d009ad authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Colin Cross
Browse files

AAPT2: Add supported manifest elements 

Adds some elements present in res/values/attrs_manifest.xml to manifest
parsing.

<additional-certificate> in <manifest><application><uses-static-library>
<meta-data> in <manifest><permission>
<package-verifier> in <manifest>
<restrict-update> in <manifest>

Bug: 79755007
Test: manual
Change-Id: I50520a99ce5ced9908001430b2108d7a5c71f8a7
Merged-In: I50520a99ce5ced9908001430b2108d7a5c71f8a7
(cherry picked from commit 66f6cfb8)
parent 74152194

tools/aapt2/link/ManifestFixer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -346,6 +346,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 
  manifest_action["uses-permission"];

  manifest_action["uses-permission-sdk-23"];

  manifest_action["permission"];

  manifest_action["permission"]["meta-data"] = meta_data_action;

  manifest_action["permission-tree"];

  manifest_action["permission-group"];

  manifest_action["uses-configuration"];
@@ -355,6 +356,8 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 
  manifest_action["compatible-screens"];

  manifest_action["compatible-screens"]["screen"];

  manifest_action["supports-gl-texture"];

  manifest_action["restrict-update"];

  manifest_action["package-verifier"];

  manifest_action["meta-data"] = meta_data_action;

  manifest_action["uses-split"].Action(RequiredNameIsJavaPackage);
@@ -376,6 +379,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, 
  uses_static_library_action.Action(RequiredNameIsJavaPackage);

  uses_static_library_action.Action(RequiredAndroidAttribute("version"));

  uses_static_library_action.Action(RequiredAndroidAttribute("certDigest"));

  uses_static_library_action["additional-certificate"];



  if (options_.debug_mode) {

    application_action.Action([&](xml::Element* el) -> bool {