diff options
| author | Tamas Berghammer <tberghammer@google.com> | 2016-06-22 15:21:38 +0100 |
|---|---|---|
| committer | Tamas Berghammer <tberghammer@google.com> | 2016-11-08 14:06:09 +0000 |
| commit | 383db5ebcc3a4a615faf249bf4f126f42e80b82e (patch) | |
| tree | 75bf14fb2ad46cc7f0cdb8c9c008d1f8c37fa519 /tools/aapt2/proto/TableProtoSerializer.cpp | |
| parent | e7f6ca32de6eebfed88e31156f2e264dc72fc3f1 (diff) | |
Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
Diffstat (limited to 'tools/aapt2/proto/TableProtoSerializer.cpp')
| -rw-r--r-- | tools/aapt2/proto/TableProtoSerializer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt2/proto/TableProtoSerializer.cpp b/tools/aapt2/proto/TableProtoSerializer.cpp index 68db6b333bdc..0d0e46da4ec8 100644 --- a/tools/aapt2/proto/TableProtoSerializer.cpp +++ b/tools/aapt2/proto/TableProtoSerializer.cpp @@ -361,7 +361,7 @@ bool CompiledFileInputStream::ReadLittleEndian32(uint32_t* out_val) { bool CompiledFileInputStream::ReadCompiledFile(pb::CompiledFile* out_val) { EnsureAlignedRead(); - uint64_t pb_size = 0u; + google::protobuf::uint64 pb_size = 0u; if (!in_.ReadLittleEndian64(&pb_size)) { return false; } @@ -389,7 +389,7 @@ bool CompiledFileInputStream::ReadDataMetaData(uint64_t* out_offset, uint64_t* out_len) { EnsureAlignedRead(); - uint64_t pb_size = 0u; + google::protobuf::uint64 pb_size = 0u; if (!in_.ReadLittleEndian64(&pb_size)) { return false; } |