commit 32bb5fae353b5bb6275e75952e89c514c7369cee
author Dianne Hackborn <hackbod@google.com> Tue Feb 11 13:56:21 2014 -0800
committer Dianne Hackborn <hackbod@google.com> Tue Feb 11 14:22:14 2014 -0800
tree e1cb0e8fbdd8c7aa03f1971e4a55da7f8e6d7b68
parent 6adfd86ca94f3eabb93fb1b4a0b9b0ea50895dcd

Fix build.

At least part of what is broken.  Other stuff still seems to be.

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591

include/androidfw/AssetManager.h

diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h
index e0c6183..503377c 100644
--- a/include/androidfw/AssetManager.h
+++ b/include/androidfw/AssetManager.h
@@ -224,7 +224,7 @@
      * corresponding overlay package.
      */
     bool createIdmap(const char* targetApkPath, const char* overlayApkPath,
-        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize);
+        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize);
 
 private:
     struct asset_path

include/androidfw/ResourceTypes.h

diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index caa8da7..0f51826 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1377,7 +1377,7 @@
     ~ResTable();
 
     status_t add(Asset* asset, const int32_t cookie, bool copyData,
-                 const void* idmap);
+                 const void* idmap = NULL);
     status_t add(const void *data, size_t size);
     status_t add(ResTable* src);
 
@@ -1644,7 +1644,7 @@
     status_t createIdmap(const ResTable& overlay,
             uint32_t targetCrc, uint32_t overlayCrc,
             const char* targetPath, const char* overlayPath,
-            void** outData, uint32_t* outSize) const
+            void** outData, size_t* outSize) const
     {
         (void)targetPath;
         (void)overlayPath;

libs/androidfw/AssetManager.cpp

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index aa69d2f..a24a8b3 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -242,7 +242,7 @@
 }
 
 bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath,
-        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize)
+        uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize)
 {
     AutoMutex _l(mLock);
     const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) };
@@ -257,7 +257,7 @@
             ALOGW("failed to find resources.arsc in %s\n", ap.path.string());
             return false;
         }
-        tables[i].add(ass, (void*)1, false);
+        tables[i].add(ass, 1, false);
     }
 
     return tables[0].createIdmap(tables[1], targetCrc, overlayCrc,