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

Commit d9e385b1 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Colin Cross
Browse files

Fix build. 

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

Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
(cherry picked from commit 32bb5fae)
parent 4e795ebe

include/androidfw/AssetManager.h

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

include/androidfw/ResourceTypes.h

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -1551,7 +1551,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

    {

        (void)targetPath;

        (void)overlayPath;

libs/androidfw/AssetManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ bool AssetManager::addAssetPath(const String8& path, 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) };
@@ -257,7 +257,7 @@ bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApk 
            ALOGW("failed to find resources.arsc in %s\n", ap.path.string());

            return false;

        }

        tables[i].add(ass, (void*)1, false);

        tables[i].add(ass, 1, false);

    }



    return tables[0].createIdmap(tables[1], targetCrc, overlayCrc,