diff --git a/Android.bp b/Android.bp
index 1fe8359..569aea5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4656,6 +4656,14 @@
   ],
 }
 
+// GN: //src/trace_processor:descriptors
+filegroup {
+  name: "perfetto_src_trace_processor_descriptors",
+  srcs: [
+    "src/trace_processor/descriptors.cc",
+  ],
+}
+
 // GN: //src/trace_processor:lib
 filegroup {
   name: "perfetto_src_trace_processor_lib",
@@ -4694,7 +4702,6 @@
 filegroup {
   name: "perfetto_src_trace_processor_metrics_lib",
   srcs: [
-    "src/trace_processor/metrics/descriptors.cc",
     "src/trace_processor/metrics/metrics.cc",
   ],
 }
@@ -4749,6 +4756,7 @@
     "src/trace_processor/importers/fuchsia/fuchsia_trace_tokenizer.cc",
     "src/trace_processor/importers/fuchsia/fuchsia_trace_utils.cc",
     "src/trace_processor/importers/proto/android_probes_parser.cc",
+    "src/trace_processor/importers/proto/args_table_utils.cc",
     "src/trace_processor/importers/proto/graphics_event_parser.cc",
     "src/trace_processor/importers/proto/heap_graph_module.cc",
     "src/trace_processor/importers/proto/heap_graph_tracker.cc",
@@ -4801,6 +4809,7 @@
     "src/trace_processor/ftrace_utils_unittest.cc",
     "src/trace_processor/heap_profile_tracker_unittest.cc",
     "src/trace_processor/importers/fuchsia/fuchsia_trace_utils_unittest.cc",
+    "src/trace_processor/importers/proto/args_table_utils_unittest.cc",
     "src/trace_processor/importers/proto/heap_graph_walker_unittest.cc",
     "src/trace_processor/importers/proto/proto_trace_parser_unittest.cc",
     "src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
@@ -5549,6 +5558,7 @@
     ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_db_lib",
     ":perfetto_src_trace_processor_db_unittests",
+    ":perfetto_src_trace_processor_descriptors",
     ":perfetto_src_trace_processor_lib",
     ":perfetto_src_trace_processor_metrics_lib",
     ":perfetto_src_trace_processor_metrics_unittests",
@@ -5767,6 +5777,7 @@
     ":perfetto_src_protozero_protozero",
     ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_db_lib",
+    ":perfetto_src_trace_processor_descriptors",
     ":perfetto_src_trace_processor_lib",
     ":perfetto_src_trace_processor_metrics_lib",
     ":perfetto_src_trace_processor_sqlite_sqlite",
@@ -5872,6 +5883,7 @@
     ":perfetto_src_protozero_protozero",
     ":perfetto_src_trace_processor_common",
     ":perfetto_src_trace_processor_db_lib",
+    ":perfetto_src_trace_processor_descriptors",
     ":perfetto_src_trace_processor_lib",
     ":perfetto_src_trace_processor_metrics_lib",
     ":perfetto_src_trace_processor_sqlite_sqlite",