commit 92d263378a73aed451852f68e33422530ae9ab9d
author Krzysztof Kosiński <krzysio@google.com> Sat Aug 06 08:24:47 2022 +0000
committer Krzysztof Kosiński <krzysio@google.com> Sat Aug 06 08:24:47 2022 +0000
tree 37a0e702637ce5be0ec3c08180e9f8523c43dd21
parent 1d81f1e0a3ba7cbec25375e69876f3a56974216a

aapt2: Fix deprecated proto API usage.

Bug: 203713560
Test: presubmit
Change-Id: Ie8bb2c010cff1c2e861918496290d1ef6dd6daef

tools/aapt2/format/Container.cpp

diff --git a/tools/aapt2/format/Container.cpp b/tools/aapt2/format/Container.cpp
index 9cef7b3..1ff6c49 100644
--- a/tools/aapt2/format/Container.cpp
+++ b/tools/aapt2/format/Container.cpp
@@ -76,7 +76,7 @@
   coded_out.WriteLittleEndian32(kResTable);
 
   // Write the aligned size.
-  const ::google::protobuf::uint64 size = table.ByteSize();
+  const size_t size = table.ByteSizeLong();
   const int padding = CalculatePaddingForAlignment(size);
   coded_out.WriteLittleEndian64(size);
 
@@ -109,7 +109,7 @@
   coded_out.WriteLittleEndian32(kResFile);
 
   // Write the aligned size.
-  const ::google::protobuf::uint32 header_size = file.ByteSize();
+  const size_t header_size = file.ByteSizeLong();
   const int header_padding = CalculatePaddingForAlignment(header_size);
   const ::google::protobuf::uint64 data_size = in->TotalSize();
   const int data_padding = CalculatePaddingForAlignment(data_size);