Commit 885d2e1e authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

Revert "Manually roll src/third_party/perfetto 0dace75a3e64..08a30f8552a1 (8 commits)"

This reverts commit 9da458ed.

Reason for revert: Appears to have caused a buildbreak on win-archive-rel bot: https://ci.chromium.org/p/chromium/builders/ci/win-archive-rel/10166

Original change's description:
> Manually roll src/third_party/perfetto 0dace75a3e64..08a30f8552a1 (8 commits)
> 
> https://android.googlesource.com/platform/external/perfetto.git/+log/0dace75a3e64..08a30f8552a1
> 
> git log 0dace75a3e64..08a30f8552a1 --date=short --first-parent --format='%ad %ae %s'
> 2020-01-27 eseckler@google.com Merge "build: add src/tracing/ipc/service to Chrome's libperfetto"
> 2020-01-27 treehugger-gerrit@google.com Merge "traced_perf: re-enable linux build + add x86 regs handling"
> 2020-01-27 fmayer@google.com Merge "Fix StackProfileTracker for empty callstack."
> 2020-01-27 primiano@google.com Speculatively fix chromium roll
> 2020-01-27 primiano@google.com Roll clang, libcxx and fuzzer
> 2020-01-27 primiano@google.com Update GN and mass reformat gn files
> 2020-01-27 primiano@google.com Merge "GN: clean up build files, split ipc client/service"
> 2020-01-27 taylori@google.com Merge "perfetto-ui: Fix canvas limit px"
> 
> Created with:
>   gclient setdep -r src/third_party/perfetto@08a30f8552a1
> 
> If this roll has caused a breakage, revert this CL and stop the roller
> using the controls here:
> https://autoroll.skia.org/r/perfetto-chromium-autoroll
> Please CC perfetto-bugs@google.com on the revert to ensure that a human
> is aware of the problem.
> 
> To report a problem with the AutoRoller itself, please file a bug:
> https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
> 
> Documentation for the AutoRoller is here:
> https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
> 
> Bug: None
> Change-Id: Ib610f52351d8b97a7a9f80f7c492e5a67b060c55
> Tbr: perfetto-bugs@google.com
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2022646
> Reviewed-by: Primiano Tucci <primiano@chromium.org>
> Reviewed-by: Eric Seckler <eseckler@chromium.org>
> Commit-Queue: Primiano Tucci <primiano@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735490}

TBR=primiano@chromium.org,eseckler@chromium.org

Change-Id: I8de9e0549e3b7d6b22854e0e9da865a6145ea31c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: None
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2023230Reviewed-by: default avatarJoe Downing <joedow@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735509}
parent a6c6a636
......@@ -1297,7 +1297,7 @@ deps = {
},
'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '23f670b7701ced5f0ef28456148c2662a5f5991a',
Var('android_git') + '/platform/external/perfetto.git' + '@' + '0dace75a3e643c8759f73fc91872beb2863ca9b4',
'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
......@@ -72,7 +72,7 @@ source_set("test_utils") {
"perfetto/system_test_utils.h",
]
deps += [ "//third_party/perfetto/src/tracing/ipc/service" ]
deps += [ "//third_party/perfetto/src/tracing:ipc" ]
}
}
......
......@@ -120,7 +120,7 @@ target(tracing_lib_type, "cpp") {
"perfetto/android_system_producer.cc",
"perfetto/android_system_producer.h",
]
deps += [ "//third_party/perfetto/src/tracing/ipc/producer" ]
deps += [ "//third_party/perfetto/src/tracing:ipc" ]
}
if (is_android && can_unwind_with_cfi_table && is_official_build) {
......
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