Commit 096d9c56 authored by Primiano Tucci's avatar Primiano Tucci Committed by Commit Bot

[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/+/1776088Reviewed-by: 's avatarPeter Marshall <petermarshall@chromium.org>
Reviewed-by: 's avatarTamer Tas <tmrts@chromium.org>
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Auto-Submit: Primiano Tucci <primiano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63584}
parent fba03abc
...@@ -246,7 +246,7 @@ deps = { ...@@ -246,7 +246,7 @@ deps = {
'dep_type': 'cipd', 'dep_type': 'cipd',
}, },
'v8/third_party/perfetto': 'v8/third_party/perfetto':
Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2', Var('android_url') + '/platform/external/perfetto.git' + '@' + '28b633cd961b50c4c75bfb7f62eeac79e27c1a79',
'v8/third_party/protobuf': 'v8/third_party/protobuf':
Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91', Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
} }
......
include_rules = [ include_rules = [
"+perfetto", "+protos/perfetto",
"+third_party/perfetto/include/perfetto/base", "+third_party/perfetto/include/perfetto/base",
] ]
\ No newline at end of file
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
#include <cmath> #include <cmath>
#include "base/trace_event/common/trace_event_common.h" #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 "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/logging.h"
#include "src/base/macros.h" #include "src/base/macros.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include "src/libplatform/tracing/trace-event-listener.h" #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" #include "src/base/logging.h"
namespace v8 { namespace v8 {
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#ifdef V8_USE_PERFETTO #ifdef V8_USE_PERFETTO
#include "base/trace_event/common/trace_event_common.h" #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 "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/platform.h"
#include "src/base/platform/semaphore.h" #include "src/base/platform/semaphore.h"
#include "src/libplatform/tracing/json-trace-event-listener.h" #include "src/libplatform/tracing/json-trace-event-listener.h"
......
...@@ -2,5 +2,5 @@ include_rules = [ ...@@ -2,5 +2,5 @@ include_rules = [
"+src", "+src",
"+tools", "+tools",
"+torque-generated", "+torque-generated",
"+perfetto", "+protos/perfetto",
] ]
\ No newline at end of file
include_rules = [ include_rules = [
"+perfetto", "+protos/perfetto",
] ]
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include "test/cctest/cctest.h" #include "test/cctest/cctest.h"
#ifdef V8_USE_PERFETTO #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 "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/json-trace-event-listener.h"
#include "src/libplatform/tracing/trace-event-listener.h" #include "src/libplatform/tracing/trace-event-listener.h"
#endif // V8_USE_PERFETTO #endif // V8_USE_PERFETTO
......
...@@ -54,8 +54,8 @@ ...@@ -54,8 +54,8 @@
#include "src/tracing/trace-event.h" #include "src/tracing/trace-event.h"
#ifdef V8_USE_PERFETTO #ifdef V8_USE_PERFETTO
#include "perfetto/trace/chrome/chrome_trace_event.pb.h" #include "protos/perfetto/trace/chrome/chrome_trace_event.pb.h"
#include "perfetto/trace/trace.pb.h" #include "protos/perfetto/trace/trace.pb.h"
#endif #endif
namespace v8 { namespace v8 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment