resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index b35878a7b313fde3f0575c0f4abee28e014077d2..d66cdf01c1f53b5fe178cd1864a35bdf3b3e2956 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -1852,7 +1852,7 @@ ssize_t AaptAssets::slurpFromArgs(Bundle* bundle)
         sp<AaptDir> assetAaptDir = makeDir(String8(kAssetDir));
         AaptGroupEntry group;
         count = assetAaptDir->slurpFullTree(bundle, assetRoot, group,
         sp<AaptDir> assetAaptDir = makeDir(String8(kAssetDir));
         AaptGroupEntry group;
         count = assetAaptDir->slurpFullTree(bundle, assetRoot, group,

-                                            String8(), mFullResPaths);
+                                            String8(), mFullAssetPaths);

         if (count < 0) {
             totalCount = count;
             goto bail;
         if (count < 0) {
             totalCount = count;
             goto bail;


@@ -1926,7 +1926,7 @@ ssize_t AaptAssets::slurpFromArgs(Bundle* bundle)
          * guarantees about ordering, so we're okay with an inorder search
          * using whatever order the OS happens to hand back to us.
          */
          * guarantees about ordering, so we're okay with an inorder search
          * using whatever order the OS happens to hand back to us.
          */

-        count = slurpFullTree(bundle, assetRoot, AaptGroupEntry(), String8(), mFullResPaths);
+        count = slurpFullTree(bundle, assetRoot, AaptGroupEntry(), String8(), mFullAssetPaths);

         if (count < 0) {
             /* failure; report error and remove archive */
             totalCount = count;
         if (count < 0) {
             /* failure; report error and remove archive */
             totalCount = count;