summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-11 18:02:06 -0800
committerColin Cross <ccross@android.com>2014-02-11 18:02:06 -0800
commitecbeae74f299f44f9ec4c79ddd885e999d4e1b64 (patch)
tree060184a770f7410ef85c57416bb2422f0abea051 /libs/androidfw
parent89492190b39e301d8203d0a9a9f6b11120c16ecb (diff)
downloadframeworks_base-ecbeae74f299f44f9ec4c79ddd885e999d4e1b64.zip
frameworks_base-ecbeae74f299f44f9ec4c79ddd885e999d4e1b64.tar.gz
frameworks_base-ecbeae74f299f44f9ec4c79ddd885e999d4e1b64.tar.bz2
Use size_t* in AssetManager::createIdmap
ResTable::createIdmap takes a size_t*, and the idmap command is passing in a size_t*, make AssetManager::createIdmap take a size_t*. Should fix the mac build. Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
Diffstat (limited to 'libs/androidfw')
-rw-r--r--libs/androidfw/AssetManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 05a948d..5069958 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -285,7 +285,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie)
}
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) };