From a2bb565db553e3def89a6e010b59f2fd1db98ff4 Mon Sep 17 00:00:00 2001 From: Adam Lesinski Date: Mon, 10 Nov 2014 17:56:11 -0800 Subject: [PATCH] AAPT: Ignore densities specified in -c flag The --preferred-density flag knows how to handle missing resources of specific densities. Using -c with a density leads to missing resources. Change-Id: I2251d842f48c08ed083663bb7ed608e14c4983c8 --- tools/aapt/ResourceFilter.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/aapt/ResourceFilter.cpp b/tools/aapt/ResourceFilter.cpp index fc95e148ea416..8693999c7cc4e 100644 --- a/tools/aapt/ResourceFilter.cpp +++ b/tools/aapt/ResourceFilter.cpp @@ -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; }