diff options
| author | Colin Cross <ccross@android.com> | 2014-02-11 18:02:06 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-11 18:02:06 -0800 |
| commit | ecbeae74f299f44f9ec4c79ddd885e999d4e1b64 (patch) | |
| tree | 060184a770f7410ef85c57416bb2422f0abea051 /include | |
| parent | 89492190b39e301d8203d0a9a9f6b11120c16ecb (diff) | |
| download | frameworks_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 'include')
| -rw-r--r-- | include/androidfw/AssetManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index ac47900..a13dd16 100644 --- a/include/androidfw/AssetManager.h +++ b/include/androidfw/AssetManager.h @@ -231,7 +231,7 @@ public: * 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 |