commit 4e1658afb8a79aa03a5ca712b02b2a33fb00bf6d
author Xavier Ducrohet <xav@google.com> Sun Oct 10 15:14:34 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Oct 10 15:14:34 2010 -0700
tree 46f233df1b40da6a1e5f08b08ad149a2dd9a849a
parent 1e6a3a53fc4d56e3a0f86c8721dedfd46e738a32
parent 0a226d84e1e67fc5a180d65246ed942266701fb8

Merge "Avoid pre-processing images when they won't be used" into gingerbread

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 9c5fcda2..c8ba904 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -835,7 +835,9 @@
     bool hasErrors = false;
 
     if (drawables != NULL) {
-        err = preProcessImages(bundle, assets, drawables);
+        if (bundle->getOutputAPKFile() != NULL) {
+            err = preProcessImages(bundle, assets, drawables);
+        }
         if (err == NO_ERROR) {
             err = makeFileResources(bundle, assets, &table, drawables, "drawable");
             if (err != NO_ERROR) {