am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"

[android/aapt.git] / AaptAssets.h

diff --git a/AaptAssets.h b/AaptAssets.h
index 65743d80f35b33732d433034b947718808eafe68..82dfd71be8e4b1c7f6297409e2eb5fc7e33e36ed 100644 (file)
--- a/AaptAssets.h
+++ b/AaptAssets.h
@@ -140,6 +140,7 @@ inline int strictly_order_type(const AaptGroupEntry& lhs, const AaptGroupEntry&
 }
 
 class AaptGroup;
 }
 
 class AaptGroup;

+class FilePathStore;

 
 /**
  * A single asset file we know about.
 
 /**
  * A single asset file we know about.


@@ -269,7 +270,8 @@ public:
     virtual ssize_t slurpFullTree(Bundle* bundle,
                                   const String8& srcDir,
                                   const AaptGroupEntry& kind,
     virtual ssize_t slurpFullTree(Bundle* bundle,
                                   const String8& srcDir,
                                   const AaptGroupEntry& kind,

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

 
     /*
      * Perform some sanity checks on the names of files and directories here.
 
     /*
      * Perform some sanity checks on the names of files and directories here.


@@ -484,6 +486,14 @@ public:
     ResourceTypeSet();
 };
 
     ResourceTypeSet();
 };
 

+// Storage for lists of fully qualified paths for
+// resources encountered during slurping.
+class FilePathStore : public RefBase,
+                      public Vector<String8>
+{
+public:
+    FilePathStore();
+};

 
 /**
  * Asset hierarchy being operated on.
 
 /**
  * Asset hierarchy being operated on.


@@ -517,7 +527,8 @@ public:
     virtual ssize_t slurpFullTree(Bundle* bundle,
                                   const String8& srcDir,
                                   const AaptGroupEntry& kind,
     virtual ssize_t slurpFullTree(Bundle* bundle,
                                   const String8& srcDir,
                                   const AaptGroupEntry& kind,

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

 
     ssize_t slurpResourceTree(Bundle* bundle, const String8& srcDir);
     ssize_t slurpResourceZip(Bundle* bundle, const char* filename);
 
     ssize_t slurpResourceTree(Bundle* bundle, const String8& srcDir);
     ssize_t slurpResourceZip(Bundle* bundle, const char* filename);


@@ -545,6 +556,14 @@ public:
     inline void 
         setResources(KeyedVector<String8, sp<ResourceTypeSet> >* res) { delete mRes; mRes = res; }
 
     inline void 
         setResources(KeyedVector<String8, sp<ResourceTypeSet> >* res) { delete mRes; mRes = res; }
 

+    inline sp<FilePathStore>& getFullResPaths() { return mFullResPaths; }
+    inline void
+        setFullResPaths(sp<FilePathStore>& res) { mFullResPaths = res; }
+
+    inline sp<FilePathStore>& getFullAssetPaths() { return mFullAssetPaths; }
+    inline void
+        setFullAssetPaths(sp<FilePathStore>& res) { mFullAssetPaths = res; }
+

 private:
     String8 mPackage;
     SortedVector<AaptGroupEntry> mGroupEntries;
 private:
     String8 mPackage;
     SortedVector<AaptGroupEntry> mGroupEntries;


@@ -558,6 +577,9 @@ private:
 
     sp<AaptAssets> mOverlay;
     KeyedVector<String8, sp<ResourceTypeSet> >* mRes;
 
     sp<AaptAssets> mOverlay;
     KeyedVector<String8, sp<ResourceTypeSet> >* mRes;

+
+    sp<FilePathStore> mFullResPaths;
+    sp<FilePathStore> mFullAssetPaths;

 };
 
 #endif // __AAPT_ASSETS_H
 };
 
 #endif // __AAPT_ASSETS_H