diff --git a/Android.bp b/Android.bp
index 29c6574..b8545f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1994,7 +1994,6 @@
         ":perfetto_src_protozero_protozero",
         ":perfetto_src_trace_processor_containers_containers",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_dynamic_dynamic",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -2025,6 +2024,7 @@
         ":perfetto_src_trace_processor_metrics_metrics",
         ":perfetto_src_trace_processor_prelude_functions_functions",
         ":perfetto_src_trace_processor_prelude_operators_operators",
+        ":perfetto_src_trace_processor_prelude_table_functions_table_functions",
         ":perfetto_src_trace_processor_sorter_sorter",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",
@@ -9187,38 +9187,6 @@
     ],
 }
 
-// GN: //src/trace_processor/dynamic:dynamic
-filegroup {
-    name: "perfetto_src_trace_processor_dynamic_dynamic",
-    srcs: [
-        "src/trace_processor/dynamic/ancestor_generator.cc",
-        "src/trace_processor/dynamic/connected_flow_generator.cc",
-        "src/trace_processor/dynamic/descendant_generator.cc",
-        "src/trace_processor/dynamic/dynamic_table_generator.cc",
-        "src/trace_processor/dynamic/experimental_annotated_stack_generator.cc",
-        "src/trace_processor/dynamic/experimental_counter_dur_generator.cc",
-        "src/trace_processor/dynamic/experimental_flamegraph_generator.cc",
-        "src/trace_processor/dynamic/experimental_flat_slice_generator.cc",
-        "src/trace_processor/dynamic/experimental_sched_upid_generator.cc",
-        "src/trace_processor/dynamic/experimental_slice_layout_generator.cc",
-        "src/trace_processor/dynamic/flamegraph_construction_algorithms.cc",
-        "src/trace_processor/dynamic/view_generator.cc",
-    ],
-}
-
-// GN: //src/trace_processor/dynamic:unittests
-filegroup {
-    name: "perfetto_src_trace_processor_dynamic_unittests",
-    srcs: [
-        "src/trace_processor/dynamic/ancestor_generator_unittest.cc",
-        "src/trace_processor/dynamic/connected_flow_generator_unittest.cc",
-        "src/trace_processor/dynamic/descendant_generator_unittest.cc",
-        "src/trace_processor/dynamic/experimental_counter_dur_generator_unittest.cc",
-        "src/trace_processor/dynamic/experimental_flat_slice_generator_unittest.cc",
-        "src/trace_processor/dynamic/experimental_slice_layout_generator_unittest.cc",
-    ],
-}
-
 // GN: //src/trace_processor:export_json
 filegroup {
     name: "perfetto_src_trace_processor_export_json",
@@ -9933,6 +9901,38 @@
     ],
 }
 
+// GN: //src/trace_processor/prelude/table_functions:table_functions
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_table_functions_table_functions",
+    srcs: [
+        "src/trace_processor/prelude/table_functions/ancestor.cc",
+        "src/trace_processor/prelude/table_functions/connected_flow.cc",
+        "src/trace_processor/prelude/table_functions/descendant.cc",
+        "src/trace_processor/prelude/table_functions/experimental_annotated_stack.cc",
+        "src/trace_processor/prelude/table_functions/experimental_counter_dur.cc",
+        "src/trace_processor/prelude/table_functions/experimental_flamegraph.cc",
+        "src/trace_processor/prelude/table_functions/experimental_flat_slice.cc",
+        "src/trace_processor/prelude/table_functions/experimental_sched_upid.cc",
+        "src/trace_processor/prelude/table_functions/experimental_slice_layout.cc",
+        "src/trace_processor/prelude/table_functions/flamegraph_construction_algorithms.cc",
+        "src/trace_processor/prelude/table_functions/table_function.cc",
+        "src/trace_processor/prelude/table_functions/view.cc",
+    ],
+}
+
+// GN: //src/trace_processor/prelude/table_functions:unittests
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_table_functions_unittests",
+    srcs: [
+        "src/trace_processor/prelude/table_functions/ancestor_unittest.cc",
+        "src/trace_processor/prelude/table_functions/connected_flow_unittest.cc",
+        "src/trace_processor/prelude/table_functions/descendant_unittest.cc",
+        "src/trace_processor/prelude/table_functions/experimental_counter_dur_unittest.cc",
+        "src/trace_processor/prelude/table_functions/experimental_flat_slice_unittest.cc",
+        "src/trace_processor/prelude/table_functions/experimental_slice_layout_unittest.cc",
+    ],
+}
+
 // GN: //src/trace_processor/rpc:httpd
 filegroup {
     name: "perfetto_src_trace_processor_rpc_httpd",
@@ -11590,8 +11590,6 @@
         ":perfetto_src_trace_processor_containers_unittests",
         ":perfetto_src_trace_processor_db_db",
         ":perfetto_src_trace_processor_db_unittests",
-        ":perfetto_src_trace_processor_dynamic_dynamic",
-        ":perfetto_src_trace_processor_dynamic_unittests",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_android_bugreport_unittests",
@@ -11633,6 +11631,8 @@
         ":perfetto_src_trace_processor_prelude_functions_unittests",
         ":perfetto_src_trace_processor_prelude_operators_operators",
         ":perfetto_src_trace_processor_prelude_operators_unittests",
+        ":perfetto_src_trace_processor_prelude_table_functions_table_functions",
+        ":perfetto_src_trace_processor_prelude_table_functions_unittests",
         ":perfetto_src_trace_processor_rpc_rpc",
         ":perfetto_src_trace_processor_rpc_unittests",
         ":perfetto_src_trace_processor_sorter_sorter",
@@ -12271,7 +12271,6 @@
         ":perfetto_src_protozero_protozero",
         ":perfetto_src_trace_processor_containers_containers",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_dynamic_dynamic",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -12302,6 +12301,7 @@
         ":perfetto_src_trace_processor_metrics_metrics",
         ":perfetto_src_trace_processor_prelude_functions_functions",
         ":perfetto_src_trace_processor_prelude_operators_operators",
+        ":perfetto_src_trace_processor_prelude_table_functions_table_functions",
         ":perfetto_src_trace_processor_rpc_httpd",
         ":perfetto_src_trace_processor_rpc_rpc",
         ":perfetto_src_trace_processor_sorter_sorter",
@@ -12491,7 +12491,6 @@
         ":perfetto_src_protozero_protozero",
         ":perfetto_src_trace_processor_containers_containers",
         ":perfetto_src_trace_processor_db_db",
-        ":perfetto_src_trace_processor_dynamic_dynamic",
         ":perfetto_src_trace_processor_export_json",
         ":perfetto_src_trace_processor_importers_android_bugreport_android_bugreport",
         ":perfetto_src_trace_processor_importers_common_common",
@@ -12522,6 +12521,7 @@
         ":perfetto_src_trace_processor_metrics_metrics",
         ":perfetto_src_trace_processor_prelude_functions_functions",
         ":perfetto_src_trace_processor_prelude_operators_operators",
+        ":perfetto_src_trace_processor_prelude_table_functions_table_functions",
         ":perfetto_src_trace_processor_sorter_sorter",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",