perfetto: fix descriptor naming to prevent double proto gen
This CL renames some gn targets to remove some duplicate source sets
being generated in Bazel.
Change-Id: I287d2f611006ab3c8569c2eccde532da7bf79007
diff --git a/Android.bp b/Android.bp
index 6001c94..5681e0a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6549,6 +6549,44 @@
],
}
+// GN: //protos/perfetto/trace/track_event:descriptor
+genrule {
+ name: "perfetto_protos_perfetto_trace_track_event_descriptor",
+ srcs: [
+ "protos/perfetto/trace/track_event/chrome_application_state_info.proto",
+ "protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
+ "protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto",
+ "protos/perfetto/trace/track_event/chrome_frame_reporter.proto",
+ "protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
+ "protos/perfetto/trace/track_event/chrome_keyed_service.proto",
+ "protos/perfetto/trace/track_event/chrome_latency_info.proto",
+ "protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
+ "protos/perfetto/trace/track_event/chrome_message_pump.proto",
+ "protos/perfetto/trace/track_event/chrome_mojo_event_info.proto",
+ "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto",
+ "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
+ "protos/perfetto/trace/track_event/chrome_user_event.proto",
+ "protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto",
+ "protos/perfetto/trace/track_event/counter_descriptor.proto",
+ "protos/perfetto/trace/track_event/debug_annotation.proto",
+ "protos/perfetto/trace/track_event/log_message.proto",
+ "protos/perfetto/trace/track_event/process_descriptor.proto",
+ "protos/perfetto/trace/track_event/source_location.proto",
+ "protos/perfetto/trace/track_event/task_execution.proto",
+ "protos/perfetto/trace/track_event/thread_descriptor.proto",
+ "protos/perfetto/trace/track_event/track_descriptor.proto",
+ "protos/perfetto/trace/track_event/track_event.proto",
+ ],
+ tools: [
+ "aprotoc",
+ ],
+ cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --descriptor_set_out=$(out) $(in)",
+ out: [
+ "perfetto_protos_perfetto_trace_track_event_descriptor.bin",
+ ],
+}
+
// GN: //protos/perfetto/trace/track_event:lite
genrule {
name: "perfetto_protos_perfetto_trace_track_event_lite_gen",
@@ -6675,44 +6713,6 @@
],
}
-// GN: //protos/perfetto/trace/track_event:track_event_descriptor
-genrule {
- name: "perfetto_protos_perfetto_trace_track_event_track_event_descriptor",
- srcs: [
- "protos/perfetto/trace/track_event/chrome_application_state_info.proto",
- "protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
- "protos/perfetto/trace/track_event/chrome_content_settings_event_info.proto",
- "protos/perfetto/trace/track_event/chrome_frame_reporter.proto",
- "protos/perfetto/trace/track_event/chrome_histogram_sample.proto",
- "protos/perfetto/trace/track_event/chrome_keyed_service.proto",
- "protos/perfetto/trace/track_event/chrome_latency_info.proto",
- "protos/perfetto/trace/track_event/chrome_legacy_ipc.proto",
- "protos/perfetto/trace/track_event/chrome_message_pump.proto",
- "protos/perfetto/trace/track_event/chrome_mojo_event_info.proto",
- "protos/perfetto/trace/track_event/chrome_process_descriptor.proto",
- "protos/perfetto/trace/track_event/chrome_renderer_scheduler_state.proto",
- "protos/perfetto/trace/track_event/chrome_thread_descriptor.proto",
- "protos/perfetto/trace/track_event/chrome_user_event.proto",
- "protos/perfetto/trace/track_event/chrome_window_handle_event_info.proto",
- "protos/perfetto/trace/track_event/counter_descriptor.proto",
- "protos/perfetto/trace/track_event/debug_annotation.proto",
- "protos/perfetto/trace/track_event/log_message.proto",
- "protos/perfetto/trace/track_event/process_descriptor.proto",
- "protos/perfetto/trace/track_event/source_location.proto",
- "protos/perfetto/trace/track_event/task_execution.proto",
- "protos/perfetto/trace/track_event/thread_descriptor.proto",
- "protos/perfetto/trace/track_event/track_descriptor.proto",
- "protos/perfetto/trace/track_event/track_event.proto",
- ],
- tools: [
- "aprotoc",
- ],
- cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --descriptor_set_out=$(out) $(in)",
- out: [
- "perfetto_protos_perfetto_trace_track_event_track_event_descriptor.bin",
- ],
-}
-
// GN: //protos/perfetto/trace/track_event:zero
genrule {
name: "perfetto_protos_perfetto_trace_track_event_zero_gen",
@@ -6841,9 +6841,9 @@
],
}
-// GN: //protos/third_party/chromium:chrome_track_event_descriptor
+// GN: //protos/third_party/chromium:descriptor
genrule {
- name: "perfetto_protos_third_party_chromium_chrome_track_event_descriptor",
+ name: "perfetto_protos_third_party_chromium_descriptor",
srcs: [
"protos/perfetto/trace/track_event/chrome_application_state_info.proto",
"protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.proto",
@@ -6876,7 +6876,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --descriptor_set_out=$(out) $(in)",
out: [
- "perfetto_protos_third_party_chromium_chrome_track_event_descriptor.bin",
+ "perfetto_protos_third_party_chromium_descriptor.bin",
],
}
@@ -8002,7 +8002,7 @@
genrule {
name: "perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
srcs: [
- ":perfetto_protos_third_party_chromium_chrome_track_event_descriptor",
+ ":perfetto_protos_third_party_chromium_descriptor",
],
cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
out: [
@@ -8032,7 +8032,7 @@
genrule {
name: "perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
srcs: [
- ":perfetto_protos_perfetto_trace_track_event_track_event_descriptor",
+ ":perfetto_protos_perfetto_trace_track_event_descriptor",
],
cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
out: [