Commit 71e151ad authored by Andrew Shulaev's avatar Andrew Shulaev Committed by Commit Bot

Make ChromeTrackEvent visible with TRACE_EVENT macro

Bug: b/171790119
Change-Id: I00249eab13ecee8163c52f90a91bcaeaa8899a2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2507651Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: default avatarEric Seckler <eseckler@chromium.org>
Commit-Queue: Andrew Shulaev <ddrone@google.com>
Cr-Commit-Position: refs/heads/master@{#828192}
parent e8ff09b2
...@@ -2196,6 +2196,7 @@ component("base") { ...@@ -2196,6 +2196,7 @@ component("base") {
deps += [ deps += [
"//base/tracing/protos:chrome_track_event", "//base/tracing/protos:chrome_track_event",
"//base/tracing/protos:chrome_track_event_zero",
"//third_party/perfetto/include/perfetto/protozero", "//third_party/perfetto/include/perfetto/protozero",
] ]
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
// Needed not for this file, but for every user of the TRACE_EVENT macros for // Needed not for this file, but for every user of the TRACE_EVENT macros for
// the lambda definition. So included here for convenience. // the lambda definition. So included here for convenience.
#include "base/tracing/protos/chrome_track_event.pbzero.h"
#include "third_party/perfetto/include/perfetto/tracing/event_context.h" #include "third_party/perfetto/include/perfetto/tracing/event_context.h"
#include "third_party/perfetto/protos/perfetto/trace/track_event/track_event.pbzero.h"
#if defined(TRACE_EVENT_BEGIN) #if defined(TRACE_EVENT_BEGIN)
#error "Another copy of perfetto tracing macros have been included" #error "Another copy of perfetto tracing macros have been included"
......
...@@ -20,6 +20,8 @@ protozero_library("chrome_track_event_zero") { ...@@ -20,6 +20,8 @@ protozero_library("chrome_track_event_zero") {
perfetto_root_path = "//third_party/perfetto/" perfetto_root_path = "//third_party/perfetto/"
sources = [ "chrome_track_event.proto" ] sources = [ "chrome_track_event.proto" ]
import_dirs = [ "//third_party/perfetto/" ] import_dirs = [ "//third_party/perfetto/" ]
generator_plugin_options = "wrapper_namespace=pbzero"
omit_protozero_dep = true
} }
grit("chrome_track_event_resources") { grit("chrome_track_event_resources") {
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
syntax = "proto2"; syntax = "proto2";
import "protos/perfetto/trace/track_event/track_event.proto"; import public "protos/perfetto/trace/track_event/track_event.proto";
package perfetto.protos; package perfetto.protos;
......
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