diff --git a/Android.bp b/Android.bp
index 94246a2..18259c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1995,8 +1995,9 @@
         ":perfetto_src_trace_processor_lib",
         ":perfetto_src_trace_processor_metatrace",
         ":perfetto_src_trace_processor_metrics_metrics",
+        ":perfetto_src_trace_processor_prelude_functions_functions",
+        ":perfetto_src_trace_processor_prelude_operators_operators",
         ":perfetto_src_trace_processor_sorter_sorter",
-        ":perfetto_src_trace_processor_sqlite_functions_functions",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",
         ":perfetto_src_trace_processor_storage_minimal",
@@ -9789,6 +9790,45 @@
     ],
 }
 
+// GN: //src/trace_processor/prelude/functions:functions
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_functions_functions",
+    srcs: [
+        "src/trace_processor/prelude/functions/create_function.cc",
+        "src/trace_processor/prelude/functions/create_function_internal.cc",
+        "src/trace_processor/prelude/functions/create_view_function.cc",
+        "src/trace_processor/prelude/functions/import.cc",
+        "src/trace_processor/prelude/functions/pprof_functions.cc",
+        "src/trace_processor/prelude/functions/register_function.cc",
+        "src/trace_processor/prelude/functions/sqlite3_str_split.cc",
+    ],
+}
+
+// GN: //src/trace_processor/prelude/functions:unittests
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_functions_unittests",
+    srcs: [
+        "src/trace_processor/prelude/functions/sqlite3_str_split_unittest.cc",
+    ],
+}
+
+// GN: //src/trace_processor/prelude/operators:operators
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_operators_operators",
+    srcs: [
+        "src/trace_processor/prelude/operators/span_join_operator.cc",
+        "src/trace_processor/prelude/operators/window_operator.cc",
+    ],
+}
+
+// GN: //src/trace_processor/prelude/operators:unittests
+filegroup {
+    name: "perfetto_src_trace_processor_prelude_operators_unittests",
+    srcs: [
+        "src/trace_processor/prelude/operators/span_join_operator_unittest.cc",
+    ],
+}
+
 // GN: //src/trace_processor/rpc:httpd
 filegroup {
     name: "perfetto_src_trace_processor_rpc_httpd",
@@ -9831,39 +9871,15 @@
     ],
 }
 
-// GN: //src/trace_processor/sqlite/functions:functions
-filegroup {
-    name: "perfetto_src_trace_processor_sqlite_functions_functions",
-    srcs: [
-        "src/trace_processor/sqlite/functions/create_function.cc",
-        "src/trace_processor/sqlite/functions/create_function_internal.cc",
-        "src/trace_processor/sqlite/functions/create_view_function.cc",
-        "src/trace_processor/sqlite/functions/import.cc",
-        "src/trace_processor/sqlite/functions/pprof_functions.cc",
-        "src/trace_processor/sqlite/functions/register_function.cc",
-        "src/trace_processor/sqlite/functions/sqlite3_str_split.cc",
-    ],
-}
-
-// GN: //src/trace_processor/sqlite/functions:unittests
-filegroup {
-    name: "perfetto_src_trace_processor_sqlite_functions_unittests",
-    srcs: [
-        "src/trace_processor/sqlite/functions/sqlite3_str_split_unittest.cc",
-    ],
-}
-
 // GN: //src/trace_processor/sqlite:sqlite
 filegroup {
     name: "perfetto_src_trace_processor_sqlite_sqlite",
     srcs: [
         "src/trace_processor/sqlite/db_sqlite_table.cc",
-        "src/trace_processor/sqlite/span_join_operator_table.cc",
         "src/trace_processor/sqlite/sql_stats_table.cc",
         "src/trace_processor/sqlite/sqlite_raw_table.cc",
         "src/trace_processor/sqlite/sqlite_utils.cc",
         "src/trace_processor/sqlite/stats_table.cc",
-        "src/trace_processor/sqlite/window_operator_table.cc",
     ],
 }
 
@@ -9882,7 +9898,6 @@
     srcs: [
         "src/trace_processor/sqlite/db_sqlite_table_unittest.cc",
         "src/trace_processor/sqlite/query_constraints_unittest.cc",
-        "src/trace_processor/sqlite/span_join_operator_table_unittest.cc",
         "src/trace_processor/sqlite/sqlite_utils_unittest.cc",
     ],
 }
@@ -11441,12 +11456,14 @@
         ":perfetto_src_trace_processor_metatrace",
         ":perfetto_src_trace_processor_metrics_metrics",
         ":perfetto_src_trace_processor_metrics_unittests",
+        ":perfetto_src_trace_processor_prelude_functions_functions",
+        ":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_rpc_rpc",
         ":perfetto_src_trace_processor_rpc_unittests",
         ":perfetto_src_trace_processor_sorter_sorter",
         ":perfetto_src_trace_processor_sorter_unittests",
-        ":perfetto_src_trace_processor_sqlite_functions_functions",
-        ":perfetto_src_trace_processor_sqlite_functions_unittests",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",
         ":perfetto_src_trace_processor_sqlite_unittests",
@@ -12100,10 +12117,11 @@
         ":perfetto_src_trace_processor_lib",
         ":perfetto_src_trace_processor_metatrace",
         ":perfetto_src_trace_processor_metrics_metrics",
+        ":perfetto_src_trace_processor_prelude_functions_functions",
+        ":perfetto_src_trace_processor_prelude_operators_operators",
         ":perfetto_src_trace_processor_rpc_httpd",
         ":perfetto_src_trace_processor_rpc_rpc",
         ":perfetto_src_trace_processor_sorter_sorter",
-        ":perfetto_src_trace_processor_sqlite_functions_functions",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",
         ":perfetto_src_trace_processor_storage_minimal",
@@ -12311,8 +12329,9 @@
         ":perfetto_src_trace_processor_lib",
         ":perfetto_src_trace_processor_metatrace",
         ":perfetto_src_trace_processor_metrics_metrics",
+        ":perfetto_src_trace_processor_prelude_functions_functions",
+        ":perfetto_src_trace_processor_prelude_operators_operators",
         ":perfetto_src_trace_processor_sorter_sorter",
-        ":perfetto_src_trace_processor_sqlite_functions_functions",
         ":perfetto_src_trace_processor_sqlite_sqlite",
         ":perfetto_src_trace_processor_sqlite_sqlite_minimal",
         ":perfetto_src_trace_processor_storage_minimal",