Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a5fc11d78e

Change-Id: Id751b5a4c087fa062a31e88e153302a326fe34a8
This commit is contained in:
Adam Lesinski
2017-08-07 22:28:43 +00:00
committed by android-build-merger
parent e5ebdc3c97 a5fc11d78e
commit ff9914ee56
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt2/cmd/Util.cpp
View File

@@ -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(