diff --git a/Android.bp b/Android.bp
index 5589098..12f93ef 100644
--- a/Android.bp
+++ b/Android.bp
@@ -110,6 +110,8 @@
     ":perfetto_src_base_unix_socket",
     ":perfetto_src_ipc_client",
     ":perfetto_src_ipc_common",
+    ":perfetto_src_profiling_common_callstack_trie",
+    ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_memory_daemon",
     ":perfetto_src_profiling_memory_proc_utils",
@@ -1342,6 +1344,8 @@
     ":perfetto_src_ipc_common",
     ":perfetto_src_ipc_host",
     ":perfetto_src_perfetto_cmd_perfetto_atoms",
+    ":perfetto_src_profiling_common_callstack_trie",
+    ":perfetto_src_profiling_common_interner",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_memory_client",
     ":perfetto_src_profiling_memory_daemon",
@@ -5594,6 +5598,27 @@
   ],
 }
 
+// GN: //src/profiling/common:callstack_trie
+filegroup {
+  name: "perfetto_src_profiling_common_callstack_trie",
+  srcs: [
+    "src/profiling/common/callstack_trie.cc",
+  ],
+}
+
+// GN: //src/profiling/common:interner
+filegroup {
+  name: "perfetto_src_profiling_common_interner",
+}
+
+// GN: //src/profiling/common:unittests
+filegroup {
+  name: "perfetto_src_profiling_common_unittests",
+  srcs: [
+    "src/profiling/common/interner_unittest.cc",
+  ],
+}
+
 // GN: //src/profiling/common:unwind_support
 filegroup {
   name: "perfetto_src_profiling_common_unwind_support",
@@ -5687,7 +5712,6 @@
     "src/profiling/memory/bookkeeping_unittest.cc",
     "src/profiling/memory/client_unittest.cc",
     "src/profiling/memory/heapprofd_producer_unittest.cc",
-    "src/profiling/memory/interner_unittest.cc",
     "src/profiling/memory/page_idle_checker_unittest.cc",
     "src/profiling/memory/proc_utils_unittest.cc",
     "src/profiling/memory/sampler_unittest.cc",
@@ -6970,6 +6994,9 @@
     ":perfetto_src_perfetto_cmd_protos_gen",
     ":perfetto_src_perfetto_cmd_trigger_producer",
     ":perfetto_src_perfetto_cmd_unittests",
+    ":perfetto_src_profiling_common_callstack_trie",
+    ":perfetto_src_profiling_common_interner",
+    ":perfetto_src_profiling_common_unittests",
     ":perfetto_src_profiling_common_unwind_support",
     ":perfetto_src_profiling_deobfuscator",
     ":perfetto_src_profiling_memory_client",