diff --git a/Android.bp b/Android.bp
index 4fd984e..44ab92c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -334,9 +334,9 @@
     "src/tracing/core/trace_packet.cc",
     "src/tracing/core/trace_writer_impl.cc",
     "test/end_to_end_integrationtest.cc",
-    "test/fake_consumer.cc",
     "test/fake_producer.cc",
     "test/task_runner_thread.cc",
+    "test/test_helper.cc",
   ],
   shared_libs: [
     "libandroid",
@@ -3549,10 +3549,10 @@
     "src/ftrace_reader/ftrace_procfs.cc",
     "src/ftrace_reader/proto_translation_table.cc",
     "src/traced/probes/probes_producer.cc",
-    "test/fake_producer.cc",
-    "test/fake_consumer.cc",
-    "test/task_runner_thread.cc",
     "test/end_to_end_integrationtest.cc",
+    "test/fake_producer.cc",
+    "test/task_runner_thread.cc",
+    "test/test_helper.cc",
   ],
   export_include_dirs: [
     ".",