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

Commit ff9914ee authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

Merge "AAPT2: Add targetConfig to AndroidManifest.xml" into oc-mr1-dev 

am: a5fc11d7

Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8
parents e5ebdc3c a5fc11d7

tools/aapt2/cmd/Util.cpp

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ std::unique_ptr<xml::XmlResource> GenerateSplitManifest(const AppInfo& app_info, 
        xml::Attribute{"", "configForSplit", app_info.split_name.value()});

  }



  // Splits may contain more configurations than originally desired (fallback densities, etc.).

  // This makes programmatic discovery of split targetting difficult. Encode the original

  // split constraints intended for this split.

  std::stringstream target_config_str;

  target_config_str << util::Joiner(constraints.configs, ",");

  manifest_el->attributes.push_back(xml::Attribute{"", "targetConfig", target_config_str.str()});



  std::unique_ptr<xml::Element> application_el = util::make_unique<xml::Element>();

  application_el->name = "application";

  application_el->attributes.push_back(