diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-11-06 12:54:36 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-11-06 14:57:34 -0800 |
| commit | dcdfe9fef4b07ee53d312c3fbecc74cb215ace6f (patch) | |
| tree | 1e689ea612de5ab03f10144b4103fae511b564e8 /tools/aapt/AaptConfig.cpp | |
| parent | d12b69518daabff3c13482f4b5140020b747b71f (diff) | |
split-select: Fix rules generated for anydpi density
Change-Id: I9de569ca9a76eb22df4d0e178df847ba1c7d0b01
Diffstat (limited to 'tools/aapt/AaptConfig.cpp')
| -rw-r--r-- | tools/aapt/AaptConfig.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/aapt/AaptConfig.cpp b/tools/aapt/AaptConfig.cpp index 848d9a1b3b91..e88c27a1b528 100644 --- a/tools/aapt/AaptConfig.cpp +++ b/tools/aapt/AaptConfig.cpp @@ -21,6 +21,7 @@ #include "AaptAssets.h" #include "AaptUtil.h" #include "ResourceFilter.h" +#include "SdkConstants.h" using android::String8; using android::Vector; @@ -241,7 +242,7 @@ void applyVersionForCompatibility(ConfigDescription* config) { uint16_t minSdk = 0; if (config->density == ResTable_config::DENSITY_ANY) { - minSdk = SDK_L; + minSdk = SDK_LOLLIPOP; } else if (config->smallestScreenWidthDp != ResTable_config::SCREENWIDTH_ANY || config->screenWidthDp != ResTable_config::SCREENWIDTH_ANY || config->screenHeightDp != ResTable_config::SCREENHEIGHT_ANY) { @@ -800,7 +801,7 @@ bool isDensityOnly(const ResTable_config& config) { } if (config.density == ResTable_config::DENSITY_ANY) { - if (config.sdkVersion != SDK_L) { + if (config.sdkVersion != SDK_LOLLIPOP) { // Someone modified the sdkVersion from the default, this is not safe to assume. return false; } |