Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master

am: e9a702d526 Change-Id: I6c7aeebfaa57bc45615c2c6dcabbcafdd34942bd
2019-08-21 14:36:34 -07:00
parent 8cf1cab8c4 e9a702d526
commit 2b3c5c79c0
1 changed files with 1 additions and 1 deletions
--- 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("}");
 }