AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Revert "[tracing] Roll perfetto @ 28b633cd"

Browse Source 
This reverts commit 096d9c5663.

Reason for revert: Broke presubmit https://ci.chromium.org/p/v8/builders/ci/V8%20Presubmit/6371

Original change's description:
> [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 <petermarshall@chromium.org>
> Reviewed-by: Tamer 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}

TBR=primiano@chromium.org,petermarshall@chromium.org,tmrts@chromium.org

Change-Id: I3ff6afa58869399b2a352cd489acdd2894ef138c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:8339
Cq-Include-Trybots: luci.v8.try:v8_linux64_perfetto_dbg_ng
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1787433
Reviewed-by: Santiago Aboy Solanes <solanes@chromium.org>
Commit-Queue: Santiago Aboy Solanes <solanes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#63585}
This commit is contained in:
Santiago Aboy Solanes 2019-09-05 17:22:43 +00:00 committed by Commit Bot
parent 096d9c5663
commit 9a9ea23055
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -246,7 +246,7 @@ deps = {
'dep_type': 'cipd',
},
'v8/third_party/perfetto':
Var('android_url') + '/platform/external/perfetto.git' + '@' + '28b633cd961b50c4c75bfb7f62eeac79e27c1a79',
Var('android_url') + '/platform/external/perfetto.git' + '@' + '01615892494a9a8dc84414962d0a817bf97de2c2',
'v8/third_party/protobuf':
Var('chromium_url') + '/external/github.com/google/protobuf'+ '@' + 'b68a347f56137b4b1a746e8c7438495a6ac1bd91',
}

4
src/libplatform/tracing/DEPS
View File

@ -1,4 +1,4 @@
include_rules = [
"+protos/perfetto",
"+perfetto",
"+third_party/perfetto/include/perfetto/base",
]
]

4
src/libplatform/tracing/json-trace-event-listener.cc
View File

@ -7,9 +7,9 @@
#include <cmath>
#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"

2
src/libplatform/tracing/trace-event-listener.cc
View File

@ -4,7 +4,7 @@
#include "src/libplatform/tracing/trace-event-listener.h"
#include "protos/perfetto/trace/trace.pb.h"
#include "perfetto/trace/trace.pb.h"
#include "src/base/logging.h"
namespace v8 {

4
src/libplatform/tracing/tracing-controller.cc
View File

@ -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"

4
test/cctest/DEPS
View File

@ -2,5 +2,5 @@ include_rules = [
"+src",
"+tools",
"+torque-generated",
"+protos/perfetto",
]
"+perfetto",
]

2
test/cctest/libplatform/DEPS
View File

@ -1,3 +1,3 @@
include_rules = [
"+protos/perfetto",
"+perfetto",
]

8
test/cctest/libplatform/test-tracing.cc
View File

@ -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

4
test/cctest/test-cpu-profiler.cc
View File

@ -54,8 +54,8 @@
#include "src/tracing/trace-event.h"
#ifdef V8_USE_PERFETTO
#include "protos/perfetto/trace/chrome/chrome_trace_event.pb.h"
#include "protos/perfetto/trace/trace.pb.h"
#include "perfetto/trace/chrome/chrome_trace_event.pb.h"
#include "perfetto/trace/trace.pb.h"
#endif
namespace v8 {