am 37cedce1: Merge "Add an aapt option to allow string variations for different devic...

Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp

* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
  Add an aapt option to allow string variations for different devices.

diff --git a/Resource.cpp b/Resource.cpp
index 9c5fcda2bcf0dd5aa3484bcfd4cffc66addad881..c8ba9048f8670a0dcd723c14e7567d0341939883 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) {