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

Merge "AAPT2: Allow multiple -c flags" into oc-dev

Browse Source 
am: 7a7e415967

Change-Id: Ifbe2a96da8bc56b052fff69ec4ea8489be1106b3
This commit is contained in:
Adam Lesinski
2017-04-04 19:32:25 +00:00
committed by android-build-merger
parent f81f4c09b6 7a7e415967
commit 1f44c49fee
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tools/aapt2/link/Link.cpp
View File

@@ -1913,7 +1913,7 @@ int Link(const std::vector<StringPiece>& args) {
std::vector<std::string> overlay_arg_list;
std::vector<std::string> extra_java_packages;
Maybe<std::string> package_id;
Maybe<std::string> configs;
std::vector<std::string> configs;
Maybe<std::string> preferred_density;
Maybe<std::string> product_list;
bool legacy_x_flag = false;
@@ -1971,7 +1971,7 @@ int Link(const std::vector<StringPiece>& args) {
&legacy_x_flag)
.OptionalSwitch("-z", "Require localization of strings marked 'suggested'",
&require_localization)
.OptionalFlag("-c",
.OptionalFlagList("-c",
"Comma separated list of configurations to include. The default\n"
"is all configurations",
&configs)
@@ -2151,28 +2151,29 @@ int Link(const std::vector<StringPiece>& args) {
}
AxisConfigFilter filter;
if (configs) {
for (const StringPiece& config_str : util::Tokenize(configs.value(), ',')) {
ConfigDescription config;
LocaleValue lv;
if (lv.InitFromFilterString(config_str)) {
lv.WriteTo(&config);
} else if (!ConfigDescription::Parse(config_str, &config)) {
context.GetDiagnostics()->Error(DiagMessage() << "invalid config '"
<< config_str
<< "' for -c option");
return 1;
}
if (configs.empty()) {
for (const std::string& config_arg : configs) {
for (const StringPiece& config_str : util::Tokenize(config_arg, ',')) {
ConfigDescription config;
LocaleValue lv;
if (lv.InitFromFilterString(config_str)) {
lv.WriteTo(&config);
} else if (!ConfigDescription::Parse(config_str, &config)) {
context.GetDiagnostics()->Error(DiagMessage() << "invalid config '"
<< config_str
<< "' for -c option");
return 1;
}
if (config.density != 0) {
context.GetDiagnostics()->Warn(DiagMessage() << "ignoring density '"
<< config
<< "' for -c option");
} else {
filter.AddConfig(config);
if (config.density != 0) {
context.GetDiagnostics()->Warn(DiagMessage() << "ignoring density '"
<< config
<< "' for -c option");
} else {
filter.AddConfig(config);
}
}
}
options.table_splitter_options.config_filter = &filter;
}