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

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

Browse Source 
automerge: 1e2e05b

* commit '1e2e05bf8cb1445f9e431ca54837bb01f762d9e6':
  AAPT: Ignore densities specified in -c flag
This commit is contained in:
Adam Lesinski
2014-11-11 22:15:44 +00:00
committed by android-build-merger
parent 3aa19984ad 1e2e05bf8c
commit be6c125783
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
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;
}