Themes: Restructure resource cache [1/2]

The new structure is as follows:
/data/resource-cache/
        ├─ theme1_pkg_name
        |     ├─ target1_pkg_name
        |     |     ├─ idmap
        |     |     └─ resources.apk
        |     ├─ target2_pkg_name
        |     ·
        |     ·
        |     ·
        |     ├─ targetN_pkg_name
        |     └─ icons
        |           ├─ hash
        |           └─ resources.apk
        ├─ theme2_pkg_name
        ·
        ·
        ·
        └─ themeN_pkg_name

Change-Id: Id39688c88929733b42368c1f20ef0e25848a3390

1 files changed, 3 insertions, 3 deletions

diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h
index 81b15bc..0fbf766 100644
--- a/include/androidfw/AssetManager.h
+++ b/include/androidfw/AssetManager.h
@@ -101,7 +101,7 @@ public:
      * newly-added asset source.
      */
     bool addAssetPath(const String8& path, int32_t* cookie);
-    bool addOverlayPath(const String8& path, int32_t* cookie,
+    bool addOverlayPath(const String8& idmapPath, const String8& overlayApkpath, int32_t* cookie,
                  const String8& resApkPath, const String8& targetPkgPath,
                  const String8& prefixPath);
     bool addCommonOverlayPath(const String8& path, int32_t* cookie,
@@ -238,7 +238,7 @@ public:
      * Generate idmap data to translate resources IDs between a package and a
      * corresponding overlay package.
      */
-    bool createIdmap(const char* targetApkPath, const char* overlayApkPath,
+    bool createIdmap(const char* targetApkPath, const char* overlayApkPath, const char* cache_path,
         uint32_t targetCrc, uint32_t overlayCrc,
         time_t targetMtime, time_t overlayMtime,
         uint32_t** outData, size_t* outSize);
@@ -309,7 +309,7 @@ private:
 
     String8 getPkgName(const char *apkPath);
 
-    String8 getOverlayResPath(const char* targetApkPath, const char* overlayApkPath);
+    String8 getOverlayResPath(const char* cachePath);
 
     class SharedZip : public RefBase {
     public: