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

Commit 50fa0bd4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues" 

* commit '9a09a523':
  androidfw: resolve 64-bit build issues
parents 36a107dd 9a09a523

libs/androidfw/BackupHelpers.cpp

+3 −3
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ int write_tarfile(const String8& packageName, const String8& domain, 


    // [ 108 :   8 ] uid -- ignored in Android format; uids are remapped at restore time

    // [ 116 :   8 ] gid -- ignored in Android format

    snprintf(buf + 108, 8, "0%lo", s.st_uid);

    snprintf(buf + 116, 8, "0%lo", s.st_gid);

    snprintf(buf + 108, 8, "0%lo", (unsigned long)s.st_uid);

    snprintf(buf + 116, 8, "0%lo", (unsigned long)s.st_gid);



    // [ 124 :  12 ] file size in bytes

    if (s.st_size > 077777777777LL) {

libs/androidfw/ResourceTypes.cpp

+75 −75
Original line number Diff line number Diff line
@@ -3147,7 +3147,7 @@ status_t ResTable::add(ResTable* src) 
}



status_t ResTable::addInternal(const void* data, size_t size, const int32_t cookie,

                       Asset* asset, bool copyData, const Asset* idmap)

                       Asset* /*asset*/, bool copyData, const Asset* idmap)

{

    if (!data) return NO_ERROR;

    Header* header = new Header(this);
@@ -3573,7 +3573,7 @@ ssize_t ResTable::resolveReference(Res_value* value, ssize_t blockIndex, 


const char16_t* ResTable::valueToString(

    const Res_value* value, size_t stringBlock,

    char16_t tmpBuffer[TMP_BUFFER_SIZE], size_t* outLen)

    char16_t /*tmpBuffer*/ [TMP_BUFFER_SIZE], size_t* outLen)

{

    if (!value) {

        return NULL;
@@ -3596,7 +3596,7 @@ ssize_t ResTable::lockBag(uint32_t resID, const bag_entry** outBag) const 
    return err;

}



void ResTable::unlockBag(const bag_entry* bag) const

void ResTable::unlockBag(const bag_entry* /*bag*/) const

{

    //printf("<<< unlockBag %p\n", this);

    mLock.unlock();

libs/androidfw/ZipUtils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public: 
    {

    }



    long read(unsigned char** nextBuffer, long readSize) {

    long read(unsigned char** nextBuffer, long /*readSize*/) {

        if (!mBufferReturned) {

            mBufferReturned = true;

            *nextBuffer = mInput;

libs/androidfw/BackupData.cpp

+1 −1

File changed.

Contains only whitespace changes.

libs/androidfw/CursorWindow.cpp

+8 −8

File changed.

Contains only whitespace changes.

libs/androidfw/Asset.cpp

+9 −9

File changed.

Contains only whitespace changes.