diff options
| -rw-r--r-- | include/androidfw/AssetManager.h | 2 | ||||
| -rw-r--r-- | include/androidfw/ResourceTypes.h | 4 | ||||
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/androidfw/AssetManager.h b/include/androidfw/AssetManager.h index ac479006cb54..a13dd16fc736 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 diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h index c022818f9780..05411ea12a54 100644 --- a/include/androidfw/ResourceTypes.h +++ b/include/androidfw/ResourceTypes.h @@ -1284,7 +1284,7 @@ public: ~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); @@ -1548,7 +1548,7 @@ public: 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; enum { IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256, diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 05a948dff25a..5069958ee1d2 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) }; |