diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-01-20 21:55:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-20 21:55:12 +0000 |
| commit | d9bd08864eaf9d8847d974eadb81806b9e086a2d (patch) | |
| tree | 7f3f1caed8501f6409955deb27db6fa211fbca62 /libs/androidfw | |
| parent | a9c122af60621597f1d008c8a283074309383aac (diff) | |
| parent | 554a6f5278ec05077d8252249afc911897fbfe76 (diff) | |
| download | frameworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.zip frameworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.tar.gz frameworks_base-d9bd08864eaf9d8847d974eadb81806b9e086a2d.tar.bz2 | |
am aee7225e: Merge "Process base APK" into lmp-mr1-dev
automerge: 554a6f5
* commit '554a6f5278ec05077d8252249afc911897fbfe76':
Process base APK
Diffstat (limited to 'libs/androidfw')
| -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 e78e4fe..7241069 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -5487,7 +5487,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++) { @@ -5498,6 +5498,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]; |