From 096d9c5663305d9e2334bc513e1228eba4f21ed7 Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Thu, 29 Aug 2019 20:10:36 +0200 Subject: [PATCH] [tracing] Roll perfetto @ 28b633cd This catches up with [1] that make the proto include path relative to the project root rather than ./protos/ [1] https://android-review.googlesource.com/c/platform/external/perfetto/+/1108421 Cq-Include-Trybots: luci.v8.try:v8_linux64_perfetto_dbg_ng Bug: v8:8339 Change-Id: I1f2dec93120142ea61cee864e4bf76a6947d958d Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1776088 Reviewed-by: Peter Marshall Reviewed-by: Tamer Tas Commit-Queue: Primiano Tucci Auto-Submit: Primiano Tucci Cr-Commit-Position: refs/heads/master@{#63584} --- DEPS | 2 +- src/libplatform/tracing/DEPS | 4 ++-- src/libplatform/tracing/json-trace-event-listener.cc | 4 ++-- src/libplatform/tracing/trace-event-listener.cc | 2 +- src/libplatform/tracing/tracing-controller.cc | 4 ++-- test/cctest/DEPS | 4 ++-- test/cctest/libplatform/DEPS | 2 +- test/cctest/libplatform/test-tracing.cc | 8 ++++---- test/cctest/test-cpu-profiler.cc | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DEPS b/DEPS index 46210845b0..97f7e272aa 100644 --- a/DEPS +++ b/DEPS @@ -246,7 +246,7 @@ deps = { 'dep_type': 'cipd', }, 'v8/third_party/perfetto': - Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2', + Var('android_url') + '/platform/external/perfetto.git' + '@' + '28b633cd961b50c4c75bfb7f62eeac79e27c1a79', 'v8/third_party/protobuf': Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91', } diff --git a/src/libplatform/tracing/DEPS b/src/libplatform/tracing/DEPS index 582200e094..4e52450cf6 100644 --- a/src/libplatform/tracing/DEPS +++ b/src/libplatform/tracing/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+perfetto", + "+protos/perfetto", "+third_party/perfetto/include/perfetto/base", -] \ No newline at end of file +] diff --git a/src/libplatform/tracing/json-trace-event-listener.cc b/src/libplatform/tracing/json-trace-event-listener.cc index 94b74ef255..60cc9a98a8 100644 --- a/src/libplatform/tracing/json-trace-event-listener.cc +++ b/src/libplatform/tracing/json-trace-event-listener.cc @@ -7,9 +7,9 @@ #include #include "base/trace_event/common/trace_event_common.h" -#include "perfetto/trace/chrome/chrome_trace_packet.pb.h" -#include "perfetto/trace/trace.pb.h" #include "perfetto/tracing.h" +#include "protos/perfetto/trace/chrome/chrome_trace_packet.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #include "src/base/logging.h" #include "src/base/macros.h" diff --git a/src/libplatform/tracing/trace-event-listener.cc b/src/libplatform/tracing/trace-event-listener.cc index 8224221228..2910d8fab2 100644 --- a/src/libplatform/tracing/trace-event-listener.cc +++ b/src/libplatform/tracing/trace-event-listener.cc @@ -4,7 +4,7 @@ #include "src/libplatform/tracing/trace-event-listener.h" -#include "perfetto/trace/trace.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #include "src/base/logging.h" namespace v8 { diff --git a/src/libplatform/tracing/tracing-controller.cc b/src/libplatform/tracing/tracing-controller.cc index 3fb34366c2..f2e2cc4d3e 100644 --- a/src/libplatform/tracing/tracing-controller.cc +++ b/src/libplatform/tracing/tracing-controller.cc @@ -14,9 +14,9 @@ #ifdef V8_USE_PERFETTO #include "base/trace_event/common/trace_event_common.h" -#include "perfetto/trace/chrome/chrome_trace_event.pbzero.h" -#include "perfetto/trace/trace_packet.pbzero.h" #include "perfetto/tracing.h" +#include "protos/perfetto/trace/chrome/chrome_trace_event.pbzero.h" +#include "protos/perfetto/trace/trace_packet.pbzero.h" #include "src/base/platform/platform.h" #include "src/base/platform/semaphore.h" #include "src/libplatform/tracing/json-trace-event-listener.h" diff --git a/test/cctest/DEPS b/test/cctest/DEPS index 7373012870..ec54e4a4a7 100644 --- a/test/cctest/DEPS +++ b/test/cctest/DEPS @@ -2,5 +2,5 @@ include_rules = [ "+src", "+tools", "+torque-generated", - "+perfetto", -] \ No newline at end of file + "+protos/perfetto", +] diff --git a/test/cctest/libplatform/DEPS b/test/cctest/libplatform/DEPS index b2bee408ab..54415e157b 100644 --- a/test/cctest/libplatform/DEPS +++ b/test/cctest/libplatform/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+perfetto", + "+protos/perfetto", ] diff --git a/test/cctest/libplatform/test-tracing.cc b/test/cctest/libplatform/test-tracing.cc index a98445be97..8c0f70f72c 100644 --- a/test/cctest/libplatform/test-tracing.cc +++ b/test/cctest/libplatform/test-tracing.cc @@ -10,11 +10,11 @@ #include "test/cctest/cctest.h" #ifdef V8_USE_PERFETTO -#include "perfetto/trace/chrome/chrome_trace_event.pb.h" -#include "perfetto/trace/chrome/chrome_trace_event.pbzero.h" -#include "perfetto/trace/chrome/chrome_trace_packet.pb.h" -#include "perfetto/trace/trace.pb.h" #include "perfetto/tracing.h" +#include "protos/perfetto/trace/chrome/chrome_trace_event.pb.h" +#include "protos/perfetto/trace/chrome/chrome_trace_event.pbzero.h" +#include "protos/perfetto/trace/chrome/chrome_trace_packet.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #include "src/libplatform/tracing/json-trace-event-listener.h" #include "src/libplatform/tracing/trace-event-listener.h" #endif // V8_USE_PERFETTO diff --git a/test/cctest/test-cpu-profiler.cc b/test/cctest/test-cpu-profiler.cc index 6d0ee0e512..c0d43b21a1 100644 --- a/test/cctest/test-cpu-profiler.cc +++ b/test/cctest/test-cpu-profiler.cc @@ -54,8 +54,8 @@ #include "src/tracing/trace-event.h" #ifdef V8_USE_PERFETTO -#include "perfetto/trace/chrome/chrome_trace_event.pb.h" -#include "perfetto/trace/trace.pb.h" +#include "protos/perfetto/trace/chrome/chrome_trace_event.pb.h" +#include "protos/perfetto/trace/trace.pb.h" #endif namespace v8 {