From dfa50902b8c593a69fb0fe954db6a83f48ce9a64 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 14 Aug 2019 09:37:07 -0700 Subject: [PATCH] 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 PRIi64 to print it. Also temporarily cast to int64_t to decouple this change from the change that updates protobuf. Bug: 117607748 Test: m checkbuild Change-Id: I482b957d2262e5001140ed1153c7de2b17facae2 --- cmds/incidentd/src/WorkDirectory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/incidentd/src/WorkDirectory.cpp b/cmds/incidentd/src/WorkDirectory.cpp index 0570c3a039ae..e826061a6a4b 100644 --- a/cmds/incidentd/src/WorkDirectory.cpp +++ b/cmds/incidentd/src/WorkDirectory.cpp @@ -209,7 +209,7 @@ void log_envelope(const ReportFileProto& envelope) { } ALOGD(" data_file=%s", envelope.data_file().c_str()); ALOGD(" privacy_policy=%d", envelope.privacy_policy()); - ALOGD(" data_file_size=%lld", envelope.data_file_size()); + ALOGD(" data_file_size=%" PRIi64, (int64_t)envelope.data_file_size()); ALOGD(" completed=%d", envelope.completed()); ALOGD("}"); } -- 2.11.0