am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...

[android/aapt.git] / AaptAssets.cpp

diff --git a/AaptAssets.cpp b/AaptAssets.cpp
index 29d2b872eadd61f55a903d8fb830a56907bd95bc..d66cdf01c1f53b5fe178cd1864a35bdf3b3e2956 100644 (file)
--- a/AaptAssets.cpp
+++ b/AaptAssets.cpp
@@ -1560,10 +1560,10 @@ status_t AaptDir::addLeafFile(const String8& leafName, const sp<AaptFile>& file)
 }
 
 ssize_t AaptDir::slurpFullTree(Bundle* bundle, const String8& srcDir,
 }
 
 ssize_t AaptDir::slurpFullTree(Bundle* bundle, const String8& srcDir,

-                            const AaptGroupEntry& kind, const String8& resType)
+                            const AaptGroupEntry& kind, const String8& resType,
+                            sp<FilePathStore>& fullResPaths)

 {
     Vector<String8> fileNames;
 {
     Vector<String8> fileNames;

-

     {
         DIR* dir = NULL;
 
     {
         DIR* dir = NULL;
 


@@ -1586,9 +1586,14 @@ ssize_t AaptDir::slurpFullTree(Bundle* bundle, const String8& srcDir,
             if (isHidden(srcDir.string(), entry->d_name))
                 continue;
 
             if (isHidden(srcDir.string(), entry->d_name))
                 continue;
 

-            fileNames.add(String8(entry->d_name));
+            String8 name(entry->d_name);
+            fileNames.add(name);
+            // Add fully qualified path for dependency purposes
+            // if we're collecting them
+            if (fullResPaths != NULL) {
+                fullResPaths->add(srcDir.appendPathCopy(name));
+            }

         }
         }

-

         closedir(dir);
     }
 
         closedir(dir);
     }
 


@@ -1615,7 +1620,7 @@ ssize_t AaptDir::slurpFullTree(Bundle* bundle, const String8& srcDir,
                 notAdded = true;
             }
             ssize_t res = subdir->slurpFullTree(bundle, pathName, kind,
                 notAdded = true;
             }
             ssize_t res = subdir->slurpFullTree(bundle, pathName, kind,

-                                                resType);
+                                                resType, fullResPaths);

             if (res < NO_ERROR) {
                 return res;
             }
             if (res < NO_ERROR) {
                 return res;
             }


@@ -1847,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());
+                                            String8(), mFullAssetPaths);

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


@@ -1878,6 +1883,7 @@ ssize_t AaptAssets::slurpFromArgs(Bundle* bundle)
                     sp<AaptAssets> nextOverlay = new AaptAssets();
                     current->setOverlay(nextOverlay);
                     current = nextOverlay;
                     sp<AaptAssets> nextOverlay = new AaptAssets();
                     current->setOverlay(nextOverlay);
                     current = nextOverlay;

+                    current->setFullResPaths(mFullResPaths);

                 }
                 count = current->slurpResourceTree(bundle, String8(res));
 
                 }
                 count = current->slurpResourceTree(bundle, String8(res));
 


@@ -1920,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());
+        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;


@@ -1946,9 +1952,10 @@ bail:
 
 ssize_t AaptAssets::slurpFullTree(Bundle* bundle, const String8& srcDir,
                                     const AaptGroupEntry& kind,
 
 ssize_t AaptAssets::slurpFullTree(Bundle* bundle, const String8& srcDir,
                                     const AaptGroupEntry& kind,

-                                    const String8& resType)
+                                    const String8& resType,
+                                    sp<FilePathStore>& fullResPaths)

 {
 {

-    ssize_t res = AaptDir::slurpFullTree(bundle, srcDir, kind, resType);
+    ssize_t res = AaptDir::slurpFullTree(bundle, srcDir, kind, resType, fullResPaths);

     if (res > 0) {
         mGroupEntries.add(kind);
     }
     if (res > 0) {
         mGroupEntries.add(kind);
     }


@@ -2010,7 +2017,7 @@ ssize_t AaptAssets::slurpResourceTree(Bundle* bundle, const String8& srcDir)
         if (type == kFileTypeDirectory) {
             sp<AaptDir> dir = makeDir(String8(entry->d_name));
             ssize_t res = dir->slurpFullTree(bundle, subdirName, group,
         if (type == kFileTypeDirectory) {
             sp<AaptDir> dir = makeDir(String8(entry->d_name));
             ssize_t res = dir->slurpFullTree(bundle, subdirName, group,

-                                                resType);
+                                                resType, mFullResPaths);

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