diff --git a/Android.bp b/Android.bp
index 862a044..bd3d9b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5992,14 +5992,12 @@
   name: "perfetto_src_trace_processor_lib",
   srcs: [
     "src/trace_processor/read_trace.cc",
-    "src/trace_processor/span_join_operator_table.cc",
     "src/trace_processor/sql_stats_table.cc",
     "src/trace_processor/sqlite_experimental_flamegraph_table.cc",
     "src/trace_processor/sqlite_raw_table.cc",
     "src/trace_processor/stats_table.cc",
     "src/trace_processor/trace_processor.cc",
     "src/trace_processor/trace_processor_impl.cc",
-    "src/trace_processor/window_operator_table.cc",
   ],
 }
 
@@ -6033,8 +6031,10 @@
   srcs: [
     "src/trace_processor/sqlite/db_sqlite_table.cc",
     "src/trace_processor/sqlite/query_constraints.cc",
+    "src/trace_processor/sqlite/span_join_operator_table.cc",
     "src/trace_processor/sqlite/sqlite3_str_split.cc",
     "src/trace_processor/sqlite/sqlite_table.cc",
+    "src/trace_processor/sqlite/window_operator_table.cc",
   ],
 }
 
@@ -6044,6 +6044,7 @@
   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/sqlite3_str_split_unittest.cc",
   ],
 }
@@ -6156,7 +6157,6 @@
     "src/trace_processor/process_tracker_unittest.cc",
     "src/trace_processor/protozero_to_text_unittests.cc",
     "src/trace_processor/slice_tracker_unittest.cc",
-    "src/trace_processor/span_join_operator_table_unittest.cc",
     "src/trace_processor/syscall_tracker_unittest.cc",
     "src/trace_processor/trace_sorter_unittest.cc",
   ],