diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-15 17:01:39 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2015-01-16 14:11:30 -0800 |
| commit | 42eea270a0a2bc54f454312817c41ac357e3a884 (patch) | |
| tree | 36a4b3f3f658c40be17f3ce7c4bc3b6836bc817a /libs | |
| parent | 8d47bc97e642cd0d0caf31d09efe05d8dc233f27 (diff) | |
| download | frameworks_base-42eea270a0a2bc54f454312817c41ac357e3a884.zip frameworks_base-42eea270a0a2bc54f454312817c41ac357e3a884.tar.gz frameworks_base-42eea270a0a2bc54f454312817c41ac357e3a884.tar.bz2 | |
Process base APK
The base APK may have resources with configurations that compete
against some splits. The base APK must be involved in the selection
of splits.
Bug:18982001
Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/ResourceTypes.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index d7b9765..bdb53c3 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -5338,7 +5338,7 @@ const DynamicRefTable* ResTable::getDynamicRefTableForCookie(int32_t cookie) con return NULL; } -void ResTable::getConfigurations(Vector<ResTable_config>* configs) const +void ResTable::getConfigurations(Vector<ResTable_config>* configs, bool ignoreMipmap) const { const size_t packageCount = mPackageGroups.size(); for (size_t i = 0; i < packageCount; i++) { @@ -5349,6 +5349,12 @@ void ResTable::getConfigurations(Vector<ResTable_config>* configs) const const size_t numTypes = typeList.size(); for (size_t k = 0; k < numTypes; k++) { const Type* type = typeList[k]; + const ResStringPool& typeStrings = type->package->typeStrings; + if (ignoreMipmap && typeStrings.string8ObjectAt( + type->typeSpec->id - 1) == "mipmap") { + continue; + } + const size_t numConfigs = type->configs.size(); for (size_t m = 0; m < numConfigs; m++) { const ResTable_type* config = type->configs[m]; |