diff options
| author | Colin Cross <ccross@android.com> | 2019-08-14 09:37:07 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-08-14 16:32:22 -0700 |
| commit | dfa50902b8c593a69fb0fe954db6a83f48ce9a64 (patch) | |
| tree | e6e83e1ba91373d8b0c23acba7c7e0b28f1d61e2 /cmds/incidentd/src | |
| parent | c64c204f59bc20b3521dca1105fbe9a768787739 (diff) | |
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
Diffstat (limited to 'cmds/incidentd/src')
| -rw-r--r-- | cmds/incidentd/src/WorkDirectory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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("}"); } |