diff --git a/Android.bp b/Android.bp
index 451c339..e6fe0cc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -79,6 +79,7 @@
     ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_interning_output",
     ":perfetto_src_profiling_common_proc_utils",
+    ":perfetto_src_profiling_common_producer_support",
     ":perfetto_src_profiling_common_profiler_guardrails",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_memory_daemon",
@@ -332,6 +333,7 @@
     ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_interning_output",
     ":perfetto_src_profiling_common_proc_utils",
+    ":perfetto_src_profiling_common_producer_support",
     ":perfetto_src_profiling_common_profiler_guardrails",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_memory_client",
@@ -1710,6 +1712,7 @@
     ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_interning_output",
     ":perfetto_src_profiling_common_proc_utils",
+    ":perfetto_src_profiling_common_producer_support",
     ":perfetto_src_profiling_common_profiler_guardrails",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_memory_client",
@@ -6839,6 +6842,14 @@
   ],
 }
 
+// GN: //src/profiling/common:producer_support
+filegroup {
+  name: "perfetto_src_profiling_common_producer_support",
+  srcs: [
+    "src/profiling/common/producer_support.cc",
+  ],
+}
+
 // GN: //src/profiling/common:profiler_guardrails
 filegroup {
   name: "perfetto_src_profiling_common_profiler_guardrails",
@@ -6853,6 +6864,7 @@
   srcs: [
     "src/profiling/common/interner_unittest.cc",
     "src/profiling/common/proc_utils_unittest.cc",
+    "src/profiling/common/producer_support_unittest.cc",
     "src/profiling/common/profiler_guardrails_unittest.cc",
   ],
 }
@@ -8680,6 +8692,7 @@
     ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_interning_output",
     ":perfetto_src_profiling_common_proc_utils",
+    ":perfetto_src_profiling_common_producer_support",
     ":perfetto_src_profiling_common_profiler_guardrails",
     ":perfetto_src_profiling_common_unittests",
     ":perfetto_src_profiling_common_unwind_support",