Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecbeae74 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 89492190

include/androidfw/AssetManager.h

+1 −1
Original line number Diff line number Diff line
@@ -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

libs/androidfw/AssetManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) };