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

Commit 54e7f53f authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Fix build."

parents d562a9b5 4385d378

include/androidfw/ResourceTypes.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -1284,7 +1284,7 @@ public: 
    ~ResTable();

    ~ResTable();





    status_t add(Asset* asset, const int32_t cookie, bool copyData,

    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(const void *data, size_t size);

    status_t add(ResTable* src);

    status_t add(ResTable* src);
@@ -1548,7 +1548,7 @@ public: 
    status_t createIdmap(const ResTable& overlay,

    status_t createIdmap(const ResTable& overlay,

            uint32_t targetCrc, uint32_t overlayCrc,

            uint32_t targetCrc, uint32_t overlayCrc,

            const char* targetPath, const char* overlayPath,

            const char* targetPath, const char* overlayPath,

            void** outData, uint32_t* outSize) const;

            void** outData, size_t* outSize) const;





    enum {

    enum {

        IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256,

        IDMAP_HEADER_SIZE_BYTES = 3 * sizeof(uint32_t) + 2 * 256,