am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be...

[android/aapt.git] / Resource.cpp

diff --git a/Resource.cpp b/Resource.cpp
index 01728a17477e1752280acf66ad6ebc613d2fcc5d..822262eda8bed411255ff816291d0cca9fd3ccc1 100644 (file)
--- a/Resource.cpp
+++ b/Resource.cpp
@@ -835,7 +835,9 @@ status_t buildResources(Bundle* bundle, const sp<AaptAssets>& assets)
     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) {