1 files changed, 35 insertions, 21 deletions

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 0fe00bea1..c7b7c1588 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -22,6 +22,7 @@ source_set("end_to_end_integrationtests") {
     ":test_helper",
     "../gn:default_deps",
     "../gn:gtest_and_gmock",
+    "../include/perfetto/ext/ipc",
     "../include/perfetto/ext/traced",
     "../include/perfetto/protozero",
     "../protos/perfetto/config:cpp",
@@ -35,9 +36,15 @@ source_set("end_to_end_integrationtests") {
     "../src/base:test_support",
     "../src/traced/probes/ftrace",
   ]
-  sources = [
-    "end_to_end_integrationtest.cc",
+
+  # These binaries are requires by the cmdline tests, which invoke perfetto
+  # and trigger_perfetto via Subprocess.
+  data_deps = [
+    "../src/perfetto_cmd:perfetto",
+    "../src/perfetto_cmd:trigger_perfetto",
   ]
+
+  sources = [ "end_to_end_integrationtest.cc" ]
   if (start_daemons_for_testing) {
     cflags = [ "-DPERFETTO_START_DAEMONS_FOR_TESTING" ]
 
@@ -52,9 +59,7 @@ source_set("end_to_end_integrationtests") {
 }
 
 executable("client_api_example") {
-  sources = [
-    "client_api_example.cc",
-  ]
+  sources = [ "client_api_example.cc" ]
   deps = [
     "..:libperfetto_client_experimental",
     "../gn:default_deps",
@@ -66,9 +71,7 @@ executable("client_api_example") {
 }
 
 perfetto_fuzzer_test("end_to_end_shared_memory_fuzzer") {
-  sources = [
-    "end_to_end_shared_memory_fuzzer.cc",
-  ]
+  sources = [ "end_to_end_shared_memory_fuzzer.cc" ]
   testonly = true
   deps = [
     ":test_helper",
@@ -76,15 +79,14 @@ perfetto_fuzzer_test("end_to_end_shared_memory_fuzzer") {
     "../protos/perfetto/trace:zero",
     "../src/base:test_support",
     "../src/protozero",
-    "../src/tracing",
-    "../src/tracing:ipc",
+    "../src/tracing/core",
+    "../src/tracing/ipc/producer",
+    "../src/tracing/ipc/service",
   ]
 }
 
 perfetto_fuzzer_test("producer_socket_fuzzer") {
-  sources = [
-    "producer_socket_fuzzer.cc",
-  ]
+  sources = [ "producer_socket_fuzzer.cc" ]
   testonly = true
   deps = [
     ":test_helper",
@@ -98,7 +100,9 @@ source_set("test_helper") {
   testonly = true
   public_deps = [
     "../protos/perfetto/trace:cpp",
-    "../src/tracing:ipc",
+    "../src/tracing/ipc/consumer",
+    "../src/tracing/ipc/producer",
+    "../src/tracing/ipc/service",
   ]
   deps = [
     "../gn:default_deps",
@@ -107,7 +111,7 @@ source_set("test_helper") {
     "../protos/perfetto/trace:zero",
     "../src/base:test_support",
     "../src/traced/probes:probes_src",
-    "../src/tracing:ipc",
+    "../src/tracing/ipc:common",
   ]
   sources = [
     "fake_producer.cc",
@@ -134,9 +138,7 @@ if (enable_perfetto_benchmarks) {
       "../protos/perfetto/trace:zero",
       "../src/base:test_support",
     ]
-    sources = [
-      "end_to_end_benchmark.cc",
-    ]
+    sources = [ "end_to_end_benchmark.cc" ]
     if (start_daemons_for_testing) {
       cflags = [ "-DPERFETTO_START_DAEMONS_FOR_TESTING" ]
     }
@@ -148,8 +150,20 @@ if (enable_perfetto_benchmarks) {
       "../gn:benchmark",
       "../gn:default_deps",
     ]
-    sources = [
-      "benchmark_main.cc",
-    ]
+    sources = [ "benchmark_main.cc" ]
   }
 }  # if (enable_perfetto_benchmarks)
+
+if (perfetto_build_with_android || (is_android && perfetto_build_standalone)) {
+  # This is used only in-tree builds. It's built in standalone builds just to
+  # get build coverage.
+  static_library("perfetto_gtest_logcat_printer") {
+    testonly = true
+    complete_static_lib = true
+    sources = [ "gtest_logcat_printer.cc" ]
+    deps = [
+      "../gn:default_deps",
+      "../gn:gtest_and_gmock",
+    ]
+  }
+}