Commit 5338df44 authored by Primiano Tucci's avatar Primiano Tucci Committed by Chromium LUCI CQ

Manual roll Perfetto from 35f78f4a4562 to eddc7d0df5d (2 revisions)

https://android.googlesource.com/platform/external/perfetto.git/+log/35f78f4a4562..eddc7d0df5d

2021-01-11 primiano@google.com Merge "Minor changes to IPC layer in preparation for Win port."
2021-01-11 primiano@google.com Merge "Exclude platform_unittest.cc from chromium builds"

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.

Bug: b/174454879
Change-Id: I3742be0d1dcb50e4c76433cbfe3efdb60063f477
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2621057
Commit-Queue: Primiano Tucci <primiano@chromium.org>
Auto-Submit: Primiano Tucci <primiano@chromium.org>
Reviewed-by: default avatarEric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#841984}
parent 55714505
......@@ -1266,7 +1266,7 @@ deps = {
},
'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + '35f78f4a4562f61cde3b096492628e1d47acb04e',
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'eddc7d0df5d1b1fc6a35162da39375cbaa809fe7',
'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
......@@ -47,8 +47,4 @@ size_t MojoSharedMemory::size() const {
return shared_buffer_->GetSize();
}
int MojoSharedMemory::fd() const {
return -1;
}
} // namespace tracing
......@@ -42,7 +42,6 @@ class COMPONENT_EXPORT(TRACING_CPP) MojoSharedMemory
// classes.
void* start() const override;
size_t size() const override;
int fd() const override;
private:
mojo::ScopedSharedBufferHandle shared_buffer_;
......
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