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

aapt2: Fix deprecated proto API usage.

Browse Source 
Bug: 203713560
Test: presubmit
Change-Id: Ie8bb2c010cff1c2e861918496290d1ef6dd6daef
This commit is contained in:
Krzysztof Kosiński
2022-08-06 08:24:47 +00:00
parent 1d81f1e0a3
commit 92d263378a
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);
// 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 @@ bool ContainerWriter::AddResFileEntry(const pb::internal::CompiledFile& file,
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);

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

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