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

Commit cfcc0b03 authored by Colin Cross's avatar Colin Cross
Browse files

Adapt to google::protobuf::int64 type change 

Protobuf 3.9.1 redefines google::protobuf::int64 from long long to
int64_t, which is sometimes long and sometimes long long.  Use PRId64
to print it.

Bug: 117607748
Test: m checkbuild
Change-Id: I6699cfdb0f0424aa3e1c98b59d941beb9f133055
Merged-In: I6699cfdb0f0424aa3e1c98b59d941beb9f133055
parent 50e408db

adb/fastdeploy/deploypatchgenerator/deploy_patch_generator.cpp

+5 −5
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ void DeployPatchGenerator::Log(const char* fmt, ...) { 


void DeployPatchGenerator::APKEntryToLog(const APKEntry& entry) {

    Log("Filename: %s", entry.filename().c_str());

    Log("CRC32: 0x%08llX", entry.crc32());

    Log("Data Offset: %lld", entry.dataoffset());

    Log("Compressed Size: %lld", entry.compressedsize());

    Log("Uncompressed Size: %lld", entry.uncompressedsize());

    Log("CRC32: 0x%08" PRIX64, entry.crc32());

    Log("Data Offset: %" PRId64, entry.dataoffset());

    Log("Compressed Size: %" PRId64, entry.compressedsize());

    Log("Uncompressed Size: %" PRId64, entry.uncompressedsize());

}



void DeployPatchGenerator::APKMetaDataToLog(const char* file, const APKMetaData& metadata) {