commit 383db5ebcc3a4a615faf249bf4f126f42e80b82e
author Tamas Berghammer <tberghammer@google.com> Wed Jun 22 15:21:38 2016 +0100
committer Tamas Berghammer <tberghammer@google.com> Tue Nov 08 14:06:09 2016 +0000
tree 75bf14fb2ad46cc7f0cdb8c9c008d1f8c37fa519
parent e7f6ca32de6eebfed88e31156f2e264dc72fc3f1

Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a

tools/aapt2/compile/Compile.cpp

diff --git a/tools/aapt2/compile/Compile.cpp b/tools/aapt2/compile/Compile.cpp
index a06140c..f0b18e6 100644
--- a/tools/aapt2/compile/Compile.cpp
+++ b/tools/aapt2/compile/Compile.cpp
@@ -482,7 +482,9 @@
 
   void BackUp(int count) override { buffer_->BackUp(count); }
 
-  int64_t ByteCount() const override { return buffer_->size(); }
+  google::protobuf::int64 ByteCount() const override {
+    return buffer_->size();
+  }
 
   bool HadError() const override { return false; }