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

Commit 4385d378 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Narayan Kamath
Browse files

Fix build. 

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

(cherry picked from 32bb5fae)

Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
parent f991771f

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);
@@ -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,