perfetto: Move perfetto_cmd out of traced
perfetto_cmd ended up not using the traced shared library.
Change-Id: Ib4475fe6ef371a3385eb80f1309b121572b53024
diff --git a/Android.bp b/Android.bp
index 5ab7e2c..0f4466e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -120,12 +120,12 @@
"src/ipc/host_impl.cc",
"src/ipc/service_proxy.cc",
"src/ipc/unix_socket.cc",
+ "src/perfetto_cmd/main.cc",
+ "src/perfetto_cmd/perfetto_cmd.cc",
"src/protozero/message.cc",
"src/protozero/message_handle.cc",
"src/protozero/proto_utils.cc",
"src/protozero/scattered_stream_writer.cc",
- "src/traced/perfetto_cmd/main.cc",
- "src/traced/perfetto_cmd/perfetto_cmd.cc",
"src/tracing/core/data_source_config.cc",
"src/tracing/core/data_source_descriptor.cc",
"src/tracing/core/ftrace_config.cc",
diff --git a/BUILD.gn b/BUILD.gn
index aeff135..b562775 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -141,10 +141,10 @@
executable("perfetto") {
deps = [
"gn:default_deps",
- "src/traced/perfetto_cmd",
+ "src/perfetto_cmd",
]
sources = [
- "src/traced/perfetto_cmd/main.cc",
+ "src/perfetto_cmd/main.cc",
]
if (is_android) {
deps += [ "src/base:android_task_runner" ]
diff --git a/src/traced/perfetto_cmd/BUILD.gn b/src/perfetto_cmd/BUILD.gn
similarity index 79%
rename from src/traced/perfetto_cmd/BUILD.gn
rename to src/perfetto_cmd/BUILD.gn
index 9778fc7..7474760 100644
--- a/src/traced/perfetto_cmd/BUILD.gn
+++ b/src/perfetto_cmd/BUILD.gn
@@ -14,14 +14,14 @@
source_set("perfetto_cmd") {
public_deps = [
- "../../../include/perfetto/traced",
+ "../../include/perfetto/traced",
]
deps = [
- "../../../gn:default_deps",
- "../../../protos/perfetto/config",
- "../../base",
- "../../protozero",
- "../../tracing:ipc_consumer",
+ "../../gn:default_deps",
+ "../../protos/perfetto/config",
+ "../base",
+ "../protozero",
+ "../tracing:ipc_consumer",
]
sources = [
"perfetto_cmd.cc",
diff --git a/src/traced/perfetto_cmd/main.cc b/src/perfetto_cmd/main.cc
similarity index 100%
rename from src/traced/perfetto_cmd/main.cc
rename to src/perfetto_cmd/main.cc
diff --git a/src/traced/perfetto_cmd/perfetto_cmd.cc b/src/perfetto_cmd/perfetto_cmd.cc
similarity index 100%
rename from src/traced/perfetto_cmd/perfetto_cmd.cc
rename to src/perfetto_cmd/perfetto_cmd.cc