diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2017-03-10 18:42:32 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2017-03-10 18:43:56 -0800 |
| commit | 2d6fa033e1b2680803d5a9978d0d1d3f8feceb21 (patch) | |
| tree | 82d5389c7be49bed7a8116a5f4460265669666fd /tools/aapt/Resource.cpp | |
| parent | 208e2644618af7474f399089c264f0da1cfb0c81 (diff) | |
AAPT: Process XML in mipmap directory
Mipmap directories should be treated like drawables.
They are just a convention that prevents them from
being split or stripped for multi-apk.
Bug: 36068314
Test: manual
Change-Id: I93ab3871c7d9d403b77989bcc88304e9939866c4
Diffstat (limited to 'tools/aapt/Resource.cpp')
| -rw-r--r-- | tools/aapt/Resource.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp index 881ac8748083..3330b1a78c1e 100644 --- a/tools/aapt/Resource.cpp +++ b/tools/aapt/Resource.cpp @@ -1513,6 +1513,21 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets, sp<ApkBuil err = NO_ERROR; } + if (mipmaps != NULL) { + ResourceDirIterator it(mipmaps, String8("mipmap")); + while ((err=it.next()) == NO_ERROR) { + err = postProcessImage(bundle, assets, &table, it.getFile()); + if (err != NO_ERROR) { + hasErrors = true; + } + } + + if (err < NO_ERROR) { + hasErrors = true; + } + err = NO_ERROR; + } + if (colors != NULL) { ResourceDirIterator it(colors, String8("color")); while ((err=it.next()) == NO_ERROR) { |