commit d9e385b111ebf811beb0f29178a2fbd4d667509f
author Dianne Hackborn <hackbod@google.com> Tue Feb 11 13:56:21 2014 -0800
committer Colin Cross <ccross@google.com> Tue Feb 11 22:47:42 2014 +0000
tree 99be89e7fadb00b002536146ee76ac5d415c5a3d
parent 4e795ebe1783623a28a988f77b4f0f11d54e73be

Fix build.

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

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)

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