commit d6a8d3c7c4bbd50db33e6bedf4f9a64cb6d274d1
author Andres Medina <medinaandres@google.com> Wed Nov 04 17:12:49 2020 -0800
committer Andres Medina <medinaandres@google.com> Wed Nov 04 17:12:49 2020 -0800
tree a3227bf98e4f0cedb38d2673a3a0c44d422fb461
parent 4cd11945c5a1810252d00d9f91147f22872ddd4b

Fixed protobuf deprecated API

Bug: 132440534
Change-Id: I75ab7e535debbcb246816683470c76fa6e2d2a0b

src/trace_processor/trace_processor_shell.cc

diff --git a/src/trace_processor/trace_processor_shell.cc b/src/trace_processor/trace_processor_shell.cc
index f8d4751..85e7c8e 100644
--- a/src/trace_processor/trace_processor_shell.cc
+++ b/src/trace_processor/trace_processor_shell.cc
@@ -46,9 +46,9 @@
 #include "src/trace_processor/rpc/httpd.h"
 #endif
 
+#include "src/profiling/symbolizer/local_symbolizer.h"
 #include "src/profiling/symbolizer/symbolize_database.h"
 #include "src/profiling/symbolizer/symbolizer.h"
-#include "src/profiling/symbolizer/local_symbolizer.h"
 
 #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) ||   \
     PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \
@@ -354,7 +354,7 @@
   pool->BuildFile(*file_desc);
 
   std::vector<uint8_t> metric_proto;
-  metric_proto.resize(static_cast<size_t>(desc_set.ByteSize()));
+  metric_proto.resize(desc_set.ByteSizeLong());
   desc_set.SerializeToArray(metric_proto.data(),
                             static_cast<int>(metric_proto.size()));