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

Commit f55c9f7a authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." 

am: 6f4b5661

* commit '6f4b5661':
  Fix misc-macro-parentheses warnings in aapt and androidfw.

Change-Id: I5333078964a57c20144acb6b538205bde2782c12
parents d05b6478 6f4b5661

libs/androidfw/ResourceTypes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6543,7 +6543,7 @@ bool ResTable::getIdmapInfo(const void* idmap, size_t sizeBytes, 
#define CHAR16_TO_CSTR(c16, len) (String8(String16(c16,len)).string())



#define CHAR16_ARRAY_EQ(constant, var, len) \

        ((len == (sizeof(constant)/sizeof(constant[0]))) && (0 == memcmp((var), (constant), (len))))

        (((len) == (sizeof(constant)/sizeof((constant)[0]))) && (0 == memcmp((var), (constant), (len))))



static void print_complex(uint32_t complex, bool isFraction)

{

tools/aapt/StringPool.cpp

+4 −4
Original line number Diff line number Diff line
@@ -390,12 +390,12 @@ sp<AaptFile> StringPool::createStringBlock() 


#define ENCODE_LENGTH(str, chrsz, strSize) \

{ \

    size_t maxMask = 1 << ((chrsz*8)-1); \

    size_t maxMask = 1 << (((chrsz)*8)-1); \

    size_t maxSize = maxMask-1; \

    if (strSize > maxSize) { \

        *str++ = maxMask | ((strSize>>(chrsz*8))&maxSize); \

    if ((strSize) > maxSize) { \

        *(str)++ = maxMask | (((strSize)>>((chrsz)*8))&maxSize); \

    } \

    *str++ = strSize; \

    *(str)++ = strSize; \

}



status_t StringPool::writeStringBlock(const sp<AaptFile>& pool)