Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "aapt2: Fix deprecated proto API usage." am: 2992680274 am: aeaa62c5d0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2176683

Change-Id: Icb2691ed78e5d563833a1aeb16585a2ae8bb39d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-25 22:16:48 +00:00
committed by Automerger Merge Worker
parent f63ffedb7c aeaa62c5d0
commit d682efe214
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/aapt2/format/Container.cpp
View File

@@ -76,7 +76,7 @@ bool ContainerWriter::AddResTableEntry(const pb::ResourceTable& table) {
coded_out.WriteLittleEndian32(kResTable); coded_out.WriteLittleEndian32(kResTable);
// Write the aligned size. // Write the aligned size.
const ::google::protobuf::uint64 size = table.ByteSize(); const size_t size = table.ByteSizeLong();
const int padding = CalculatePaddingForAlignment(size); const int padding = CalculatePaddingForAlignment(size);
coded_out.WriteLittleEndian64(size); coded_out.WriteLittleEndian64(size);
@@ -109,7 +109,7 @@ bool ContainerWriter::AddResFileEntry(const pb::internal::CompiledFile& file,
coded_out.WriteLittleEndian32(kResFile); coded_out.WriteLittleEndian32(kResFile);
// Write the aligned size. // 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 int header_padding = CalculatePaddingForAlignment(header_size);
const ::google::protobuf::uint64 data_size = in->TotalSize(); const ::google::protobuf::uint64 data_size = in->TotalSize();
const int data_padding = CalculatePaddingForAlignment(data_size); const int data_padding = CalculatePaddingForAlignment(data_size);

3
tools/aapt2/io/Util.h
View File

@@ -131,8 +131,7 @@ class ProtoInputStreamReader {
template <typename T> bool ReadMessage(T *message) { template <typename T> bool ReadMessage(T *message) {
ZeroCopyInputAdaptor adapter(in_); ZeroCopyInputAdaptor adapter(in_);
google::protobuf::io::CodedInputStream coded_stream(&adapter); google::protobuf::io::CodedInputStream coded_stream(&adapter);
coded_stream.SetTotalBytesLimit(std::numeric_limits<int32_t>::max(), coded_stream.SetTotalBytesLimit(std::numeric_limits<int32_t>::max());
coded_stream.BytesUntilTotalBytesLimit());
return message->ParseFromCodedStream(&coded_stream); return message->ParseFromCodedStream(&coded_stream);
} }