[tp] Make chrome ActiveProcesses a part of track event
This is necessary to unblock aosp/2267925.
We need to get rid of AddParsingOverrideForField for active_processes.pid, but there's no other way to parse track event extensions at the moment. So this field needs to move from extensions to "core" track event proto.
Bug: 255295843
Change-Id: I2457dd01115088c3815ec4c91d6e98ae993acb93
diff --git a/Android.bp b/Android.bp
index 4f9a16ab..99c4687 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4823,6 +4823,7 @@
"protos/perfetto/trace/trace.proto",
"protos/perfetto/trace/trace_packet.proto",
"protos/perfetto/trace/trace_packet_defaults.proto",
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7278,6 +7279,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_cpp_gen",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7309,6 +7311,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_cppgen_plugin) --plugin_out=wrapper_namespace=gen:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.gen.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.gen.cc",
@@ -7340,6 +7343,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_cpp_gen_headers",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7371,6 +7375,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location perfetto_src_protozero_protoc_plugin_cppgen_plugin) --plugin_out=wrapper_namespace=gen:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.gen.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.gen.h",
@@ -7406,6 +7411,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_descriptor",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7444,6 +7450,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_lite_gen",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7474,6 +7481,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=lite=true:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pb.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pb.cc",
@@ -7505,6 +7513,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_lite_gen_headers",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7535,6 +7544,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --cpp_out=lite=true:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pb.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pb.h",
@@ -7570,6 +7580,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_zero_gen",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7601,6 +7612,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pbzero.cc",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pbzero.cc",
@@ -7632,6 +7644,7 @@
genrule {
name: "perfetto_protos_perfetto_trace_track_event_zero_gen_headers",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -7663,6 +7676,7 @@
],
cmd: "mkdir -p $(genDir)/external/perfetto/ && $(location aprotoc) --proto_path=external/perfetto --plugin=protoc-gen-plugin=$(location protozero_plugin) --plugin_out=wrapper_namespace=pbzero:$(genDir)/external/perfetto/ $(in)",
out: [
+ "external/perfetto/protos/perfetto/trace/track_event/chrome_active_processes.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_application_state_info.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_compositor_scheduler_state.pbzero.h",
"external/perfetto/protos/perfetto/trace/track_event/chrome_content_settings_event_info.pbzero.h",
@@ -7804,6 +7818,7 @@
genrule {
name: "perfetto_protos_third_party_chromium_descriptor",
srcs: [
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
@@ -10682,6 +10697,7 @@
"protos/perfetto/trace/trace.proto",
"protos/perfetto/trace/trace_packet.proto",
"protos/perfetto/trace/trace_packet_defaults.proto",
+ "protos/perfetto/trace/track_event/chrome_active_processes.proto",
"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",
