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

Merge "AAPT: Ignore densities specified in -c flag" into lmp-mr1-dev

Browse Source
This commit is contained in:
Adam Lesinski
2014-11-11 20:23:57 +00:00
committed by Android (Google) Code Review
parent aeca1baf65 a2bb565db5
commit da772234f6
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt/ResourceFilter.cpp
View File

@@ -41,6 +41,13 @@ WeakResourceFilter::parse(const String8& str)
// Ignore the version // Ignore the version
entry.second &= ~ResTable_config::CONFIG_VERSION; entry.second &= ~ResTable_config::CONFIG_VERSION;
// Ignore any densities. Those are best handled in --preferred-density
if ((entry.second & ResTable_config::CONFIG_DENSITY) != 0) {
fprintf(stderr, "warning: ignoring flag -c %s. Use --preferred-density instead.\n", entry.first.toString().string());
entry.first.density = 0;
entry.second &= ~ResTable_config::CONFIG_DENSITY;
}
mConfigMask |= entry.second; mConfigMask |= entry.second;
} }