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",
diff --git a/BUILD b/BUILD
index b48c5ec..6ab04f7 100644
--- a/BUILD
+++ b/BUILD
@@ -813,9 +813,9 @@
],
)
-# GN target: //src/trace_processor/db:lib
+# GN target: //src/trace_processor/db:db
filegroup(
- name = "src_trace_processor_db_lib",
+ name = "src_trace_processor_db_db",
srcs = [
"src/trace_processor/db/column.cc",
"src/trace_processor/db/column.h",
@@ -827,24 +827,13 @@
],
)
-# GN target: //src/trace_processor/importers/memory_tracker:graph_processor
+# GN target: //src/trace_processor/importers/common:common
filegroup(
- name = "src_trace_processor_importers_memory_tracker_graph_processor",
- srcs = [
- "src/trace_processor/importers/memory_tracker/graph.cc",
- "src/trace_processor/importers/memory_tracker/graph_processor.cc",
- "src/trace_processor/importers/memory_tracker/memory_allocator_node_id.cc",
- "src/trace_processor/importers/memory_tracker/raw_memory_graph_node.cc",
- "src/trace_processor/importers/memory_tracker/raw_process_memory_node.cc",
- ],
-)
-
-# GN target: //src/trace_processor/importers:common
-filegroup(
- name = "src_trace_processor_importers_common",
+ name = "src_trace_processor_importers_common_common",
srcs = [
"src/trace_processor/importers/common/args_tracker.cc",
"src/trace_processor/importers/common/args_tracker.h",
+ "src/trace_processor/importers/common/chunked_trace_reader.h",
"src/trace_processor/importers/common/clock_tracker.cc",
"src/trace_processor/importers/common/clock_tracker.h",
"src/trace_processor/importers/common/event_tracker.cc",
@@ -864,6 +853,18 @@
],
)
+# GN target: //src/trace_processor/importers/memory_tracker:graph_processor
+filegroup(
+ name = "src_trace_processor_importers_memory_tracker_graph_processor",
+ srcs = [
+ "src/trace_processor/importers/memory_tracker/graph.cc",
+ "src/trace_processor/importers/memory_tracker/graph_processor.cc",
+ "src/trace_processor/importers/memory_tracker/memory_allocator_node_id.cc",
+ "src/trace_processor/importers/memory_tracker/raw_memory_graph_node.cc",
+ "src/trace_processor/importers/memory_tracker/raw_process_memory_node.cc",
+ ],
+)
+
perfetto_cc_proto_descriptor(
name = "src_trace_processor_importers_gen_cc_chrome_track_event_descriptor",
deps = [
@@ -1269,7 +1270,6 @@
filegroup(
name = "src_trace_processor_storage_minimal",
srcs = [
- "src/trace_processor/chunked_trace_reader.h",
"src/trace_processor/forwarding_trace_parser.cc",
"src/trace_processor/forwarding_trace_parser.h",
"src/trace_processor/importers/default_modules.cc",
@@ -3436,10 +3436,10 @@
srcs = [
":src_trace_processor_analysis_analysis",
":src_trace_processor_containers_containers_headers",
- ":src_trace_processor_db_lib",
+ ":src_trace_processor_db_db",
":src_trace_processor_export_json",
":src_trace_processor_ftrace_descriptors",
- ":src_trace_processor_importers_common",
+ ":src_trace_processor_importers_common_common",
":src_trace_processor_importers_memory_tracker_graph_processor",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
@@ -3532,10 +3532,10 @@
":src_profiling_symbolizer_symbolizer",
":src_trace_processor_analysis_analysis",
":src_trace_processor_containers_containers_headers",
- ":src_trace_processor_db_lib",
+ ":src_trace_processor_db_db",
":src_trace_processor_export_json",
":src_trace_processor_ftrace_descriptors",
- ":src_trace_processor_importers_common",
+ ":src_trace_processor_importers_common_common",
":src_trace_processor_importers_memory_tracker_graph_processor",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
@@ -3714,10 +3714,10 @@
":src_profiling_symbolizer_symbolizer",
":src_trace_processor_analysis_analysis",
":src_trace_processor_containers_containers_headers",
- ":src_trace_processor_db_lib",
+ ":src_trace_processor_db_db",
":src_trace_processor_export_json",
":src_trace_processor_ftrace_descriptors",
- ":src_trace_processor_importers_common",
+ ":src_trace_processor_importers_common_common",
":src_trace_processor_importers_memory_tracker_graph_processor",
":src_trace_processor_lib",
":src_trace_processor_metatrace",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 28a4cb9..e6826d2 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -68,7 +68,6 @@
source_set("storage_minimal") {
sources = [
- "chunked_trace_reader.h",
"forwarding_trace_parser.cc",
"forwarding_trace_parser.h",
"importers/default_modules.cc",
@@ -151,9 +150,9 @@
"../protozero",
"containers",
"containers:containers_headers",
- "importers:common",
"importers:gen_cc_chrome_track_event_descriptor",
"importers:gen_cc_track_event_descriptor",
+ "importers/common",
"importers/memory_tracker:graph_processor",
"storage",
"tables",
@@ -270,7 +269,7 @@
"../../protos/perfetto/trace/gpu:zero",
"../../protos/perfetto/trace/interned_data:zero",
"../protozero",
- "importers:common",
+ "importers/common",
"storage",
"tables",
"types",
@@ -339,8 +338,8 @@
"../base",
"../protozero",
"analysis",
- "db:lib",
- "importers:common",
+ "db",
+ "importers/common",
"metrics:lib",
"sqlite",
"storage",
@@ -435,8 +434,8 @@
"../protozero:testing_messages_zero",
"containers:unittests",
"db:unittests",
- "importers:common",
- "importers:unittests",
+ "importers/common",
+ "importers/common:unittests",
"importers/memory_tracker:graph_processor",
"rpc:unittests",
"storage",
diff --git a/src/trace_processor/db/BUILD.gn b/src/trace_processor/db/BUILD.gn
index 5c61b1f..53c492a 100644
--- a/src/trace_processor/db/BUILD.gn
+++ b/src/trace_processor/db/BUILD.gn
@@ -14,7 +14,7 @@
import("../../../gn/test.gni")
-source_set("lib") {
+source_set("db") {
sources = [
"column.cc",
"column.h",
@@ -41,7 +41,7 @@
"table_unittest.cc",
]
deps = [
- ":lib",
+ ":db",
"../../../gn:default_deps",
"../../../gn:gtest_and_gmock",
"../../base:base",
diff --git a/src/trace_processor/forwarding_trace_parser.h b/src/trace_processor/forwarding_trace_parser.h
index 8b8a8bb..0da568a 100644
--- a/src/trace_processor/forwarding_trace_parser.h
+++ b/src/trace_processor/forwarding_trace_parser.h
@@ -17,7 +17,7 @@
#ifndef SRC_TRACE_PROCESSOR_FORWARDING_TRACE_PARSER_H_
#define SRC_TRACE_PROCESSOR_FORWARDING_TRACE_PARSER_H_
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/importers/BUILD.gn b/src/trace_processor/importers/BUILD.gn
index d25ff6b..fceb53f 100644
--- a/src/trace_processor/importers/BUILD.gn
+++ b/src/trace_processor/importers/BUILD.gn
@@ -12,66 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("../../../gn/perfetto.gni")
import("../../../gn/perfetto_cc_proto_descriptor.gni")
-source_set("common") {
- sources = [
- "common/args_tracker.cc",
- "common/args_tracker.h",
- "common/clock_tracker.cc",
- "common/clock_tracker.h",
- "common/event_tracker.cc",
- "common/event_tracker.h",
- "common/flow_tracker.cc",
- "common/flow_tracker.h",
- "common/global_args_tracker.cc",
- "common/global_args_tracker.h",
- "common/process_tracker.cc",
- "common/process_tracker.h",
- "common/slice_tracker.cc",
- "common/slice_tracker.h",
- "common/system_info_tracker.cc",
- "common/system_info_tracker.h",
- "common/track_tracker.cc",
- "common/track_tracker.h",
- ]
- public_deps = [
- ":gen_cc_config_descriptor",
- "../util:protozero_to_text",
- ]
- deps = [
- "../../../gn:default_deps",
- "../../../protos/perfetto/common:zero",
- "../../../protos/perfetto/trace:zero",
- "../../../protos/perfetto/trace/profiling:zero",
- "../../base",
- "../storage",
- "../types",
- ]
-}
-
-source_set("unittests") {
- sources = [
- "common/clock_tracker_unittest.cc",
- "common/event_tracker_unittest.cc",
- "common/flow_tracker_unittest.cc",
- "common/process_tracker_unittest.cc",
- "common/slice_tracker_unittest.cc",
- ]
- testonly = true
- deps = [
- ":common",
- "../../../gn:default_deps",
- "../../../gn:gtest_and_gmock",
- "../../../protos/perfetto/common:zero",
- "../../../protos/perfetto/trace:zero",
- "../../base",
- "../storage",
- "../types",
- ]
-}
-
perfetto_cc_proto_descriptor("gen_cc_config_descriptor") {
descriptor_name = "config.descriptor"
descriptor_target = "../../../protos/perfetto/config:descriptor"
diff --git a/src/trace_processor/importers/common/BUILD.gn b/src/trace_processor/importers/common/BUILD.gn
new file mode 100644
index 0000000..171c733
--- /dev/null
+++ b/src/trace_processor/importers/common/BUILD.gn
@@ -0,0 +1,74 @@
+# Copyright (C) 2021 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("../../../../gn/perfetto.gni")
+
+source_set("common") {
+ sources = [
+ "args_tracker.cc",
+ "args_tracker.h",
+ "chunked_trace_reader.h",
+ "clock_tracker.cc",
+ "clock_tracker.h",
+ "event_tracker.cc",
+ "event_tracker.h",
+ "flow_tracker.cc",
+ "flow_tracker.h",
+ "global_args_tracker.cc",
+ "global_args_tracker.h",
+ "process_tracker.cc",
+ "process_tracker.h",
+ "slice_tracker.cc",
+ "slice_tracker.h",
+ "system_info_tracker.cc",
+ "system_info_tracker.h",
+ "track_tracker.cc",
+ "track_tracker.h",
+ ]
+ public_deps = [
+ "../:gen_cc_config_descriptor",
+ "../../util:protozero_to_text",
+ ]
+ deps = [
+ "../../../../gn:default_deps",
+ "../../../../include/perfetto/trace_processor:basic_types",
+ "../../../../protos/perfetto/common:zero",
+ "../../../../protos/perfetto/trace:zero",
+ "../../../../protos/perfetto/trace/profiling:zero",
+ "../../../base",
+ "../../storage",
+ "../../types",
+ ]
+}
+
+source_set("unittests") {
+ sources = [
+ "clock_tracker_unittest.cc",
+ "event_tracker_unittest.cc",
+ "flow_tracker_unittest.cc",
+ "process_tracker_unittest.cc",
+ "slice_tracker_unittest.cc",
+ ]
+ testonly = true
+ deps = [
+ ":common",
+ "../../../../gn:default_deps",
+ "../../../../gn:gtest_and_gmock",
+ "../../../../protos/perfetto/common:zero",
+ "../../../../protos/perfetto/trace:zero",
+ "../../../base",
+ "../../storage",
+ "../../types",
+ ]
+}
diff --git a/src/trace_processor/chunked_trace_reader.h b/src/trace_processor/importers/common/chunked_trace_reader.h
similarity index 87%
rename from src/trace_processor/chunked_trace_reader.h
rename to src/trace_processor/importers/common/chunked_trace_reader.h
index 8dbdd4f..dc90344 100644
--- a/src/trace_processor/chunked_trace_reader.h
+++ b/src/trace_processor/importers/common/chunked_trace_reader.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_CHUNKED_TRACE_READER_H_
-#define SRC_TRACE_PROCESSOR_CHUNKED_TRACE_READER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_COMMON_CHUNKED_TRACE_READER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_COMMON_CHUNKED_TRACE_READER_H_
#include <stddef.h>
#include <stdint.h>
@@ -47,4 +47,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_CHUNKED_TRACE_READER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_COMMON_CHUNKED_TRACE_READER_H_
diff --git a/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h b/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h
index efec186..66468b4 100644
--- a/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h
+++ b/src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.h
@@ -17,7 +17,7 @@
#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_FUCHSIA_FUCHSIA_TRACE_TOKENIZER_H_
#define SRC_TRACE_PROCESSOR_IMPORTERS_FUCHSIA_FUCHSIA_TRACE_TOKENIZER_H_
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/fuchsia/fuchsia_trace_utils.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/trace_blob_view.h"
diff --git a/src/trace_processor/importers/gzip/gzip_trace_parser.h b/src/trace_processor/importers/gzip/gzip_trace_parser.h
index b56fae3..82b4cd9 100644
--- a/src/trace_processor/importers/gzip/gzip_trace_parser.h
+++ b/src/trace_processor/importers/gzip/gzip_trace_parser.h
@@ -17,7 +17,7 @@
#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_TRACE_PARSER_H_
#define SRC_TRACE_PROCESSOR_IMPORTERS_GZIP_GZIP_TRACE_PARSER_H_
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/gzip/gzip_utils.h"
namespace perfetto {
diff --git a/src/trace_processor/importers/json/json_trace_tokenizer.h b/src/trace_processor/importers/json/json_trace_tokenizer.h
index 0ebf25c..86f5731 100644
--- a/src/trace_processor/importers/json/json_trace_tokenizer.h
+++ b/src/trace_processor/importers/json/json_trace_tokenizer.h
@@ -19,7 +19,7 @@
#include <stdint.h>
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/systrace/systrace_line_tokenizer.h"
#include "src/trace_processor/storage/trace_storage.h"
diff --git a/src/trace_processor/importers/ninja/ninja_log_parser.cc b/src/trace_processor/importers/ninja/ninja_log_parser.cc
index 4ba518d..af668f1 100644
--- a/src/trace_processor/importers/ninja/ninja_log_parser.cc
+++ b/src/trace_processor/importers/ninja/ninja_log_parser.cc
@@ -15,6 +15,7 @@
*/
#include "src/trace_processor/importers/ninja/ninja_log_parser.h"
+
#include "perfetto/ext/base/string_splitter.h"
#include "perfetto/ext/base/string_utils.h"
#include "src/trace_processor/importers/common/process_tracker.h"
diff --git a/src/trace_processor/importers/ninja/ninja_log_parser.h b/src/trace_processor/importers/ninja/ninja_log_parser.h
index 280fa5a..cd9f2b8 100644
--- a/src/trace_processor/importers/ninja/ninja_log_parser.h
+++ b/src/trace_processor/importers/ninja/ninja_log_parser.h
@@ -22,7 +22,7 @@
#include <map>
#include <string>
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/trace_parser.h"
namespace perfetto {
diff --git a/src/trace_processor/importers/proto/proto_trace_reader.h b/src/trace_processor/importers/proto/proto_trace_reader.h
index 7252f62..d2fdbf3 100644
--- a/src/trace_processor/importers/proto/proto_trace_reader.h
+++ b/src/trace_processor/importers/proto/proto_trace_reader.h
@@ -21,7 +21,7 @@
#include <memory>
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/proto/proto_incremental_state.h"
#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
#include "src/trace_processor/trace_blob_view.h"
diff --git a/src/trace_processor/importers/systrace/systrace_trace_parser.h b/src/trace_processor/importers/systrace/systrace_trace_parser.h
index 1db04ee..bcb5ea8 100644
--- a/src/trace_processor/importers/systrace/systrace_trace_parser.h
+++ b/src/trace_processor/importers/systrace/systrace_trace_parser.h
@@ -20,7 +20,7 @@
#include <deque>
#include <regex>
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/systrace/systrace_line_parser.h"
#include "src/trace_processor/importers/systrace/systrace_line_tokenizer.h"
#include "src/trace_processor/storage/trace_storage.h"
diff --git a/src/trace_processor/sqlite/BUILD.gn b/src/trace_processor/sqlite/BUILD.gn
index 52352b7..71b6918 100644
--- a/src/trace_processor/sqlite/BUILD.gn
+++ b/src/trace_processor/sqlite/BUILD.gn
@@ -47,8 +47,8 @@
"../../../include/perfetto/trace_processor",
"../../../protos/perfetto/trace/ftrace:zero",
"../../base",
- "../db:lib",
- "../importers:common",
+ "../db",
+ "../importers/common",
"../storage",
"../types",
]
diff --git a/src/trace_processor/tables/BUILD.gn b/src/trace_processor/tables/BUILD.gn
index a6d7e86..66f0cfa 100644
--- a/src/trace_processor/tables/BUILD.gn
+++ b/src/trace_processor/tables/BUILD.gn
@@ -30,7 +30,7 @@
]
deps = [
"../../../gn:default_deps",
- "../db:lib",
+ "../db",
]
}
diff --git a/src/trace_processor/trace_processor_context.cc b/src/trace_processor/trace_processor_context.cc
index 1524bf0..412b63a 100644
--- a/src/trace_processor/trace_processor_context.cc
+++ b/src/trace_processor/trace_processor_context.cc
@@ -16,9 +16,9 @@
#include "src/trace_processor/types/trace_processor_context.h"
-#include "src/trace_processor/chunked_trace_reader.h"
#include "src/trace_processor/forwarding_trace_parser.h"
#include "src/trace_processor/importers/common/args_tracker.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/importers/common/clock_tracker.h"
#include "src/trace_processor/importers/common/event_tracker.h"
#include "src/trace_processor/importers/common/flow_tracker.h"
diff --git a/src/trace_processor/virtual_destructors.cc b/src/trace_processor/virtual_destructors.cc
index 40cc0cd..55d2ba8 100644
--- a/src/trace_processor/virtual_destructors.cc
+++ b/src/trace_processor/virtual_destructors.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/chunked_trace_reader.h"
+#include "src/trace_processor/importers/common/chunked_trace_reader.h"
#include "src/trace_processor/trace_parser.h"
namespace perfetto {
