From: Xavier Ducrohet <xav@android.com>
Date: Thu, 21 Jul 2011 00:45:11 +0000 (-0700)
Subject: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/1756596c3a90f6cdbaf2bdd855e53a5645ac7c15?ds=inline;hp=--cc

resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp

Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
---

1756596c3a90f6cdbaf2bdd855e53a5645ac7c15
diff --cc Resource.cpp
index 1724c8c,5152d3b..2d5138b
--- a/Resource.cpp
+++ b/Resource.cpp
@@@ -291,20 -294,21 +295,21 @@@ static status_t makeFileResources(Bundl
  }
  
  static status_t preProcessImages(Bundle* bundle, const sp<AaptAssets>& assets,
 -                          const sp<ResourceTypeSet>& set)
 +                          const sp<ResourceTypeSet>& set, const char* type)
  {
-     ResourceDirIterator it(set, String8(type));
-     Vector<sp<AaptFile> > newNameFiles;
-     Vector<String8> newNamePaths;
      bool hasErrors = false;
-     ssize_t res;
-     while ((res=it.next()) == NO_ERROR) {
-         res = preProcessImage(bundle, assets, it.getFile(), NULL);
-         if (res < NO_ERROR) {
-             hasErrors = true;
+     ssize_t res = NO_ERROR;
+     if (bundle->getUseCrunchCache() == false) {
 -        ResourceDirIterator it(set, String8("drawable"));
++        ResourceDirIterator it(set, String8(type));
+         Vector<sp<AaptFile> > newNameFiles;
+         Vector<String8> newNamePaths;
+         while ((res=it.next()) == NO_ERROR) {
+             res = preProcessImage(bundle, assets, it.getFile(), NULL);
+             if (res < NO_ERROR) {
+                 hasErrors = true;
+             }
          }
      }
- 
      return (hasErrors || (res < NO_ERROR)) ? UNKNOWN_ERROR : NO_ERROR;
  }