tp: move chunked trace reader to common and cleanup build files
Change-Id: If871d4ed52aca3041a92f25e6e269c4424e39c49
diff --git a/Android.bp b/Android.bp
index 2061821..3a49871 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1731,10 +1731,10 @@
":perfetto_src_trace_processor_analysis_analysis",
":perfetto_src_trace_processor_containers_containers",
":perfetto_src_trace_processor_containers_containers_headers",
- ":perfetto_src_trace_processor_db_lib",
+ ":perfetto_src_trace_processor_db_db",
":perfetto_src_trace_processor_export_json",
":perfetto_src_trace_processor_ftrace_descriptors",
- ":perfetto_src_trace_processor_importers_common",
+ ":perfetto_src_trace_processor_importers_common_common",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -7536,9 +7536,9 @@
],
}
-// GN: //src/trace_processor/db:lib
+// GN: //src/trace_processor/db:db
filegroup {
- name: "perfetto_src_trace_processor_db_lib",
+ name: "perfetto_src_trace_processor_db_db",
srcs: [
"src/trace_processor/db/column.cc",
"src/trace_processor/db/table.cc",
@@ -7585,9 +7585,9 @@
],
}
-// GN: //src/trace_processor/importers:common
+// GN: //src/trace_processor/importers/common:common
filegroup {
- name: "perfetto_src_trace_processor_importers_common",
+ name: "perfetto_src_trace_processor_importers_common_common",
srcs: [
"src/trace_processor/importers/common/args_tracker.cc",
"src/trace_processor/importers/common/clock_tracker.cc",
@@ -7601,6 +7601,18 @@
],
}
+// GN: //src/trace_processor/importers/common:unittests
+filegroup {
+ name: "perfetto_src_trace_processor_importers_common_unittests",
+ srcs: [
+ "src/trace_processor/importers/common/clock_tracker_unittest.cc",
+ "src/trace_processor/importers/common/event_tracker_unittest.cc",
+ "src/trace_processor/importers/common/flow_tracker_unittest.cc",
+ "src/trace_processor/importers/common/process_tracker_unittest.cc",
+ "src/trace_processor/importers/common/slice_tracker_unittest.cc",
+ ],
+}
+
// GN: //src/trace_processor/importers:gen_cc_chrome_track_event_descriptor
genrule {
name: "perfetto_src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
@@ -7658,18 +7670,6 @@
],
}
-// GN: //src/trace_processor/importers:unittests
-filegroup {
- name: "perfetto_src_trace_processor_importers_unittests",
- srcs: [
- "src/trace_processor/importers/common/clock_tracker_unittest.cc",
- "src/trace_processor/importers/common/event_tracker_unittest.cc",
- "src/trace_processor/importers/common/flow_tracker_unittest.cc",
- "src/trace_processor/importers/common/process_tracker_unittest.cc",
- "src/trace_processor/importers/common/slice_tracker_unittest.cc",
- ],
-}
-
// GN: //src/trace_processor:lib
filegroup {
name: "perfetto_src_trace_processor_lib",
@@ -9005,13 +9005,13 @@
":perfetto_src_trace_processor_containers_containers",
":perfetto_src_trace_processor_containers_containers_headers",
":perfetto_src_trace_processor_containers_unittests",
- ":perfetto_src_trace_processor_db_lib",
+ ":perfetto_src_trace_processor_db_db",
":perfetto_src_trace_processor_db_unittests",
":perfetto_src_trace_processor_export_json",
":perfetto_src_trace_processor_ftrace_descriptors",
- ":perfetto_src_trace_processor_importers_common",
+ ":perfetto_src_trace_processor_importers_common_common",
+ ":perfetto_src_trace_processor_importers_common_unittests",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
- ":perfetto_src_trace_processor_importers_unittests",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
":perfetto_src_trace_processor_metrics_lib",
@@ -9301,10 +9301,10 @@
":perfetto_src_trace_processor_analysis_analysis",
":perfetto_src_trace_processor_containers_containers",
":perfetto_src_trace_processor_containers_containers_headers",
- ":perfetto_src_trace_processor_db_lib",
+ ":perfetto_src_trace_processor_db_db",
":perfetto_src_trace_processor_export_json",
":perfetto_src_trace_processor_ftrace_descriptors",
- ":perfetto_src_trace_processor_importers_common",
+ ":perfetto_src_trace_processor_importers_common_common",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",
@@ -9450,10 +9450,10 @@
":perfetto_src_trace_processor_analysis_analysis",
":perfetto_src_trace_processor_containers_containers",
":perfetto_src_trace_processor_containers_containers_headers",
- ":perfetto_src_trace_processor_db_lib",
+ ":perfetto_src_trace_processor_db_db",
":perfetto_src_trace_processor_export_json",
":perfetto_src_trace_processor_ftrace_descriptors",
- ":perfetto_src_trace_processor_importers_common",
+ ":perfetto_src_trace_processor_importers_common_common",
":perfetto_src_trace_processor_importers_memory_tracker_graph_processor",
":perfetto_src_trace_processor_lib",
":perfetto_src_trace_processor_metatrace",