diff --git a/Android.bp b/Android.bp
index 5c70f53..af1f5d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6256,6 +6256,7 @@
 filegroup {
   name: "perfetto_src_trace_processor_storage_full",
   srcs: [
+    "src/trace_processor/additional_modules.cc",
     "src/trace_processor/importers/ftrace/binder_tracker.cc",
     "src/trace_processor/importers/ftrace/ftrace_descriptors.cc",
     "src/trace_processor/importers/ftrace/ftrace_module_impl.cc",
@@ -6275,7 +6276,6 @@
     "src/trace_processor/importers/proto/vulkan_memory_tracker.cc",
     "src/trace_processor/importers/systrace/systrace_parser.cc",
     "src/trace_processor/importers/systrace/systrace_trace_parser.cc",
-    "src/trace_processor/register_additional_modules.cc",
     "src/trace_processor/syscall_tracker.cc",
   ],
 }
@@ -6286,6 +6286,7 @@
   srcs: [
     "src/trace_processor/args_tracker.cc",
     "src/trace_processor/clock_tracker.cc",
+    "src/trace_processor/default_modules.cc",
     "src/trace_processor/destructible.cc",
     "src/trace_processor/event_tracker.cc",
     "src/trace_processor/forwarding_trace_parser.cc",
@@ -6300,6 +6301,8 @@
     "src/trace_processor/importers/fuchsia/fuchsia_trace_utils.cc",
     "src/trace_processor/importers/proto/args_table_utils.cc",
     "src/trace_processor/importers/proto/packet_sequence_state.cc",
+    "src/trace_processor/importers/proto/profile_module.cc",
+    "src/trace_processor/importers/proto/profile_packet_utils.cc",
     "src/trace_processor/importers/proto/proto_importer_module.cc",
     "src/trace_processor/importers/proto/proto_trace_parser.cc",
     "src/trace_processor/importers/proto/proto_trace_tokenizer.cc",