Commit 78d6dd2c authored by chromium-autoroll's avatar chromium-autoroll Committed by Commit Bot

Manually roll Perfetto from 169feea71d1f to 45e268005af3 (4 revisions)

Also adds a new service-emitted field to the privacy whitelist.

Forked from crrev.com/c/2211474:

---
Roll Perfetto from 169feea71d1f to 45e268005af3 (4 revisions)

https://android.googlesource.com/platform/external/perfetto.git/+log/169feea71d1f..45e268005af3

2020-05-21 taylori@google.com Merge "ui: Add binder atrace categories to record page"
2020-05-21 taylori@google.com Merge "perfetto-ui: Don't catch query errors"
2020-05-20 treehugger-gerrit@google.com Merge "clock: Support specifying an authoritative trace clock in the config."
2020-05-20 treehugger-gerrit@google.com Merge "build: Fix libperfetto NaCl build"

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/+doc/master/autoroll/README.md

Change-Id: I3a769225a7837885701868096cfa181326622f0f
Cq-Include-Trybots: luci.chromium.try:linux-perfetto-rel
Bug: None
Tbr: perfetto-bugs@google.com
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210448
Auto-Submit: Eric Seckler <eseckler@chromium.org>
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Reviewed-by: default avatarPrimiano Tucci <primiano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770993}
parent f3935204
...@@ -1220,7 +1220,7 @@ deps = { ...@@ -1220,7 +1220,7 @@ deps = {
}, },
'src/third_party/perfetto': 'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '169feea71d1f8189a4f516339427430e1e39473c', Var('android_git') + '/platform/external/perfetto.git' + '@' + '45e268005af38b97ec575e79de33c72cb9ac3eac',
'src/third_party/perl': { 'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
...@@ -30,8 +30,10 @@ constexpr int kClockIndices[] = {1, 2, 3, 4, -1}; ...@@ -30,8 +30,10 @@ constexpr int kClockIndices[] = {1, 2, 3, 4, -1};
constexpr MessageInfo kClock = {kClockIndices, nullptr}; constexpr MessageInfo kClock = {kClockIndices, nullptr};
// Proto Message: ClockSnapshot // Proto Message: ClockSnapshot
constexpr int kClockSnapshotIndices[] = {1, -1}; // Manually whitelisted: 2 (primary_trace_clock).
constexpr MessageInfo const* kClockSnapshotComplexMessages[] = {&kClock}; constexpr int kClockSnapshotIndices[] = {1, 2, -1};
constexpr MessageInfo const* kClockSnapshotComplexMessages[] = {&kClock,
nullptr};
constexpr MessageInfo kClockSnapshot = {kClockSnapshotIndices, constexpr MessageInfo kClockSnapshot = {kClockSnapshotIndices,
kClockSnapshotComplexMessages}; kClockSnapshotComplexMessages};
......
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