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
This commit is contained in:
Colin Cross 2019-08-13 17:01:38 -07:00
parent 50e408db2d
commit cfcc0b0337
1 changed files with 5 additions and 5 deletions

View File

@ -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) {
@ -164,4 +164,4 @@ uint64_t DeployPatchGenerator::BuildIdenticalEntries(std::vector<SimpleEntry>& o
return lhs.localEntry->dataoffset() < rhs.localEntry->dataoffset();
});
return totalSize;
}
}