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

Commit ed72380f authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge "AAPT2: Add supported manifest elements"

parents 9ac32b99 66f6cfb8

tools/aapt2/link/ManifestFixer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -357,6 +357,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"];
@@ -366,6 +367,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);
@@ -387,6 +390,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 {