tp: move statsd_module into full target from minimal
Change-Id: I24229f2298be73dc346373290ced183b9c6ef916
diff --git a/Android.bp b/Android.bp
index 8c557a4..340826e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1977,9 +1977,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -2175,9 +2175,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -9236,21 +9236,6 @@
],
}
-// GN: //src/trace_processor/importers:gen_cc_statsd_atoms_descriptor
-genrule {
- name: "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
- srcs: [
- "src/trace_processor/importers/proto/atoms.descriptor",
- ],
- cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
- out: [
- "src/trace_processor/importers/atoms.descriptor.h",
- ],
- tool_files: [
- "tools/gen_cc_proto_descriptor.py",
- ],
-}
-
// GN: //src/trace_processor/importers:gen_cc_trace_descriptor
genrule {
name: "perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
@@ -9336,31 +9321,50 @@
],
}
-// GN: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+// GN: //src/trace_processor/importers/proto:full
filegroup {
- name: "perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
-}
-
-// GN: //src/trace_processor/importers/proto:storage_full
-filegroup {
- name: "perfetto_src_trace_processor_importers_proto_storage_full",
+ name: "perfetto_src_trace_processor_importers_proto_full",
srcs: [
"src/trace_processor/importers/proto/heap_graph_tracker.cc",
+ "src/trace_processor/importers/proto/statsd_module.cc",
],
}
-// GN: //src/trace_processor/importers/proto:storage_minimal
+// GN: //src/trace_processor/importers/proto:gen_cc_statsd_atoms_descriptor
+genrule {
+ name: "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
+ srcs: [
+ "src/trace_processor/importers/proto/atoms.descriptor",
+ ],
+ cmd: "$(location tools/gen_cc_proto_descriptor.py) --gen_dir=$(genDir) --cpp_out=$(out) $(in)",
+ out: [
+ "src/trace_processor/importers/proto/atoms.descriptor.h",
+ ],
+ tool_files: [
+ "tools/gen_cc_proto_descriptor.py",
+ ],
+}
+
+// GN: //src/trace_processor/importers/proto:minimal
filegroup {
- name: "perfetto_src_trace_processor_importers_proto_storage_minimal",
+ name: "perfetto_src_trace_processor_importers_proto_minimal",
srcs: [
"src/trace_processor/importers/proto/active_chrome_processes_tracker.cc",
+ "src/trace_processor/importers/proto/async_track_set_tracker.cc",
+ "src/trace_processor/importers/proto/chrome_string_lookup.cc",
"src/trace_processor/importers/proto/heap_profile_tracker.cc",
"src/trace_processor/importers/proto/packet_sequence_state_generation.cc",
"src/trace_processor/importers/proto/profiler_util.cc",
+ "src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/stack_profile_tracker.cc",
],
}
+// GN: //src/trace_processor/importers/proto:packet_sequence_state_generation_hdr
+filegroup {
+ name: "perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
+}
+
// GN: //src/trace_processor/importers/proto:unittests
filegroup {
name: "perfetto_src_trace_processor_importers_proto_unittests",
@@ -9738,8 +9742,6 @@
"src/trace_processor/importers/json/json_utils.cc",
"src/trace_processor/importers/ninja/ninja_log_parser.cc",
"src/trace_processor/importers/proto/android_camera_event_module.cc",
- "src/trace_processor/importers/proto/async_track_set_tracker.cc",
- "src/trace_processor/importers/proto/chrome_string_lookup.cc",
"src/trace_processor/importers/proto/chrome_system_probes_module.cc",
"src/trace_processor/importers/proto/chrome_system_probes_parser.cc",
"src/trace_processor/importers/proto/memory_tracker_snapshot_module.cc",
@@ -9749,11 +9751,9 @@
"src/trace_processor/importers/proto/perf_sample_tracker.cc",
"src/trace_processor/importers/proto/profile_module.cc",
"src/trace_processor/importers/proto/profile_packet_utils.cc",
- "src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/proto_trace_parser.cc",
"src/trace_processor/importers/proto/proto_trace_reader.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
- "src/trace_processor/importers/proto/statsd_module.cc",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_tokenizer.cc",
@@ -11244,9 +11244,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_proto_unittests",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
@@ -11477,9 +11477,9 @@
"perfetto_src_trace_processor_gen_cc_test_messages_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -11892,9 +11892,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -11968,9 +11968,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
@@ -12091,9 +12091,9 @@
":perfetto_src_trace_processor_importers_fuchsia_fuchsia_record",
":perfetto_src_trace_processor_importers_importers_full",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
+ ":perfetto_src_trace_processor_importers_proto_full",
+ ":perfetto_src_trace_processor_importers_proto_minimal",
":perfetto_src_trace_processor_importers_proto_packet_sequence_state_generation_hdr",
- ":perfetto_src_trace_processor_importers_proto_storage_full",
- ":perfetto_src_trace_processor_importers_proto_storage_minimal",
":perfetto_src_trace_processor_importers_systrace_systrace_line",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -12169,9 +12169,9 @@
"perfetto_src_base_version_gen_h",
"perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_config_descriptor",
- "perfetto_src_trace_processor_importers_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_trace_descriptor",
"perfetto_src_trace_processor_importers_gen_cc_track_event_descriptor",
+ "perfetto_src_trace_processor_importers_proto_gen_cc_statsd_atoms_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_all_chrome_metrics_descriptor",
"perfetto_src_trace_processor_metrics_gen_cc_metrics_descriptor",
"perfetto_src_trace_processor_metrics_sql_gen_amalgamated_sql_metrics",
