Commit bfe5cb66 authored by Primiano Tucci's avatar Primiano Tucci Committed by Commit Bot

Roll src/third_party/perfetto b0a8b66..1234c8aa (1 commit)

Manual roll to catch up with aosp/1252692

$ git log b0a8b66..1234c8aa  --date=short --first-parent --format='%ad %ae %s'
2020-03-09 primiano@google.com ObservableEvents: use the enum defined in the proto

Test: services_unittests --gtest_filter=PerfettoIntegrationTest*
Change-Id: I7bcf4804016f16ee456cb982ebe37be8e990e004
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092531
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@{#748183}
parent dda4ed23
......@@ -1250,7 +1250,7 @@ deps = {
},
'src/third_party/perfetto':
Var('android_git') + '/platform/external/perfetto.git' + '@' + 'b0a8b6693f9bb964258415e6d401f02b135903cc',
Var('android_git') + '/platform/external/perfetto.git' + '@' + '1234c8aa625fe7fbe838bcc14f5700aaa81e53a1',
'src/third_party/perl': {
'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3',
......
......@@ -589,8 +589,7 @@ ConsumerHost::ConsumerHost(PerfettoService* service) : service_(service) {
consumer_endpoint_ =
service_->GetService()->ConnectConsumer(this, 0 /*uid_t*/);
consumer_endpoint_->ObserveEvents(
perfetto::TracingService::ConsumerEndpoint::ObservableEventType::
kDataSourceInstances);
perfetto::ObservableEvents::TYPE_DATA_SOURCES_INSTANCES);
}
ConsumerHost::~ConsumerHost() {
......
......@@ -220,7 +220,7 @@ void MockConsumer::FreeBuffers() {
void MockConsumer::OnConnect() {
consumer_endpoint_->ObserveEvents(
perfetto::ConsumerEndpoint::kDataSourceInstances);
perfetto::ObservableEvents::TYPE_DATA_SOURCES_INSTANCES);
StartTracing();
}
void MockConsumer::OnDisconnect() {}
......
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