Merge "ui: Rename "tracks" directory to "core_plugins"" into main

79 files changed, 37 insertions, 37 deletions

diff --git a/ui/build.js b/ui/build.js
index cc6cfb9b1..698842cf5 100644
--- a/ui/build.js
+++ b/ui/build.js
@@ -243,7 +243,7 @@ async function main() {
     scanDir('ui/src/test/diff_viewer');
     scanDir('buildtools/typefaces');
     scanDir('buildtools/catapult_trace_viewer');
-    generateImports('ui/src/tracks', 'all_tracks.ts');
+    generateImports('ui/src/core_plugins', 'all_core_plugins.ts');
     generateImports('ui/src/plugins', 'all_plugins.ts');
     compileProtos();
     genVersion();
diff --git a/ui/src/common/actions_unittest.ts b/ui/src/common/actions_unittest.ts
index 078440292..de497d7f6 100644
--- a/ui/src/common/actions_unittest.ts
+++ b/ui/src/common/actions_unittest.ts
@@ -17,9 +17,9 @@ import {produce} from 'immer';
 import {assertExists} from '../base/logging';
 import {Time} from '../base/time';
 import {PrimaryTrackSortKey} from '../public';
-import {HEAP_PROFILE_TRACK_KIND} from '../tracks/heap_profile';
-import {PROCESS_SCHEDULING_TRACK_KIND} from '../tracks/process_summary/process_scheduling_track';
-import {THREAD_STATE_TRACK_KIND} from '../tracks/thread_state';
+import {HEAP_PROFILE_TRACK_KIND} from '../core_plugins/heap_profile';
+import {PROCESS_SCHEDULING_TRACK_KIND} from '../core_plugins/process_summary/process_scheduling_track';
+import {THREAD_STATE_TRACK_KIND} from '../core_plugins/thread_state';
 
 import {StateActions} from './actions';
 import {createEmptyState} from './empty_state';
@@ -31,7 +31,7 @@ import {
   TraceUrlSource,
   TrackSortKey,
 } from './state';
-import {SLICE_TRACK_KIND} from '../tracks/chrome_slices/chrome_slice_track';
+import {SLICE_TRACK_KIND} from '../core_plugins/chrome_slices/chrome_slice_track';
 
 function fakeTrack(
   state: State,
diff --git a/ui/src/controller/aggregation/counter_aggregation_controller.ts b/ui/src/controller/aggregation/counter_aggregation_controller.ts
index 20afd9eb2..bc8b73136 100644
--- a/ui/src/controller/aggregation/counter_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/counter_aggregation_controller.ts
@@ -17,7 +17,7 @@ import {ColumnDef} from '../../common/aggregation_data';
 import {Area, Sorting} from '../../common/state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
-import {COUNTER_TRACK_KIND} from '../../tracks/counter';
+import {COUNTER_TRACK_KIND} from '../../core_plugins/counter';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/aggregation/cpu_aggregation_controller.ts b/ui/src/controller/aggregation/cpu_aggregation_controller.ts
index 01a8964aa..6b9083ea5 100644
--- a/ui/src/controller/aggregation/cpu_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/cpu_aggregation_controller.ts
@@ -17,7 +17,7 @@ import {ColumnDef} from '../../common/aggregation_data';
 import {Area, Sorting} from '../../common/state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
-import {CPU_SLICE_TRACK_KIND} from '../../tracks/cpu_slices';
+import {CPU_SLICE_TRACK_KIND} from '../../core_plugins/cpu_slices';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/aggregation/cpu_by_process_aggregation_controller.ts b/ui/src/controller/aggregation/cpu_by_process_aggregation_controller.ts
index df18d9876..03f29f230 100644
--- a/ui/src/controller/aggregation/cpu_by_process_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/cpu_by_process_aggregation_controller.ts
@@ -17,7 +17,7 @@ import {ColumnDef} from '../../common/aggregation_data';
 import {Area, Sorting} from '../../common/state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
-import {CPU_SLICE_TRACK_KIND} from '../../tracks/cpu_slices';
+import {CPU_SLICE_TRACK_KIND} from '../../core_plugins/cpu_slices';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/aggregation/frame_aggregation_controller.ts b/ui/src/controller/aggregation/frame_aggregation_controller.ts
index fc3c2cae5..100e47bd6 100644
--- a/ui/src/controller/aggregation/frame_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/frame_aggregation_controller.ts
@@ -16,7 +16,7 @@ import {ColumnDef} from '../../common/aggregation_data';
 import {Area, Sorting} from '../../common/state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
-import {ACTUAL_FRAMES_SLICE_TRACK_KIND} from '../../tracks/frames';
+import {ACTUAL_FRAMES_SLICE_TRACK_KIND} from '../../core_plugins/frames';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/aggregation/slice_aggregation_controller.ts b/ui/src/controller/aggregation/slice_aggregation_controller.ts
index 3e18dd040..89ba573bb 100644
--- a/ui/src/controller/aggregation/slice_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/slice_aggregation_controller.ts
@@ -16,8 +16,8 @@ import {ColumnDef} from '../../common/aggregation_data';
 import {Area, Sorting} from '../../common/state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
-import {ASYNC_SLICE_TRACK_KIND} from '../../tracks/async_slices';
-import {SLICE_TRACK_KIND} from '../../tracks/chrome_slices/chrome_slice_track';
+import {ASYNC_SLICE_TRACK_KIND} from '../../core_plugins/async_slices';
+import {SLICE_TRACK_KIND} from '../../core_plugins/chrome_slices/chrome_slice_track';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/aggregation/thread_aggregation_controller.ts b/ui/src/controller/aggregation/thread_aggregation_controller.ts
index c2f38e144..98e5c77f6 100644
--- a/ui/src/controller/aggregation/thread_aggregation_controller.ts
+++ b/ui/src/controller/aggregation/thread_aggregation_controller.ts
@@ -19,7 +19,7 @@ import {translateState} from '../../common/thread_state';
 import {globals} from '../../frontend/globals';
 import {Engine} from '../../trace_processor/engine';
 import {NUM, NUM_NULL, STR_NULL} from '../../trace_processor/query_result';
-import {THREAD_STATE_TRACK_KIND} from '../../tracks/thread_state';
+import {THREAD_STATE_TRACK_KIND} from '../../core_plugins/thread_state';
 
 import {AggregationController} from './aggregation_controller';
 
diff --git a/ui/src/controller/flamegraph_controller.ts b/ui/src/controller/flamegraph_controller.ts
index 22160d643..14436f771 100644
--- a/ui/src/controller/flamegraph_controller.ts
+++ b/ui/src/controller/flamegraph_controller.ts
@@ -32,7 +32,7 @@ import {FlamegraphDetails, globals} from '../frontend/globals';
 import {publishFlamegraphDetails} from '../frontend/publish';
 import {Engine} from '../trace_processor/engine';
 import {NUM, STR} from '../trace_processor/query_result';
-import {PERF_SAMPLES_PROFILE_TRACK_KIND} from '../tracks/perf_samples_profile';
+import {PERF_SAMPLES_PROFILE_TRACK_KIND} from '../core_plugins/perf_samples_profile';
 
 import {AreaSelectionHandler} from './area_selection_handler';
 import {Controller} from './controller';
diff --git a/ui/src/controller/flow_events_controller.ts b/ui/src/controller/flow_events_controller.ts
index 183786287..aa40c6ea0 100644
--- a/ui/src/controller/flow_events_controller.ts
+++ b/ui/src/controller/flow_events_controller.ts
@@ -20,8 +20,8 @@ import {publishConnectedFlows, publishSelectedFlows} from '../frontend/publish';
 import {asSliceSqlId} from '../frontend/sql_types';
 import {Engine} from '../trace_processor/engine';
 import {LONG, NUM, STR_NULL} from '../trace_processor/query_result';
-import {SLICE_TRACK_KIND} from '../tracks/chrome_slices/chrome_slice_track';
-import {ACTUAL_FRAMES_SLICE_TRACK_KIND} from '../tracks/frames';
+import {SLICE_TRACK_KIND} from '../core_plugins/chrome_slices/chrome_slice_track';
+import {ACTUAL_FRAMES_SLICE_TRACK_KIND} from '../core_plugins/frames';
 
 import {Controller} from './controller';
 
diff --git a/ui/src/controller/index.ts b/ui/src/controller/index.ts
index ffb481b81..8154c18a9 100644
--- a/ui/src/controller/index.ts
+++ b/ui/src/controller/index.ts
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import '../gen/all_tracks';
 import '../common/recordingV2/target_factories';
 
 import {assertExists, assertTrue} from '../base/logging';
diff --git a/ui/src/controller/search_controller.ts b/ui/src/controller/search_controller.ts
index 61ada9330..ba2d35463 100644
--- a/ui/src/controller/search_controller.ts
+++ b/ui/src/controller/search_controller.ts
@@ -26,7 +26,7 @@ import {publishSearch, publishSearchResult} from '../frontend/publish';
 import {Engine} from '../trace_processor/engine';
 import {LONG, NUM, STR} from '../trace_processor/query_result';
 import {escapeSearchQuery} from '../trace_processor/query_utils';
-import {CPU_SLICE_TRACK_KIND} from '../tracks/cpu_slices';
+import {CPU_SLICE_TRACK_KIND} from '../core_plugins/cpu_slices';
 
 import {Controller} from './controller';
 
diff --git a/ui/src/controller/selection_controller.ts b/ui/src/controller/selection_controller.ts
index ce9b15f18..dc905ea85 100644
--- a/ui/src/controller/selection_controller.ts
+++ b/ui/src/controller/selection_controller.ts
@@ -37,7 +37,7 @@ import {
   STR_NULL,
   timeFromSql,
 } from '../trace_processor/query_result';
-import {SLICE_TRACK_KIND} from '../tracks/chrome_slices/chrome_slice_track';
+import {SLICE_TRACK_KIND} from '../core_plugins/chrome_slices/chrome_slice_track';
 
 import {Controller} from './controller';
 
diff --git a/ui/src/controller/track_decider.ts b/ui/src/controller/track_decider.ts
index 58f77c003..f0c7ef483 100644
--- a/ui/src/controller/track_decider.ts
+++ b/ui/src/controller/track_decider.ts
@@ -29,20 +29,20 @@ import {PrimaryTrackSortKey} from '../public';
 import {getTrackName} from '../public/utils';
 import {Engine, EngineProxy} from '../trace_processor/engine';
 import {NUM, NUM_NULL, STR, STR_NULL} from '../trace_processor/query_result';
-import {ASYNC_SLICE_TRACK_KIND} from '../tracks/async_slices';
+import {ASYNC_SLICE_TRACK_KIND} from '../core_plugins/async_slices';
 import {
   ENABLE_SCROLL_JANK_PLUGIN_V2,
   getScrollJankTracks,
-} from '../tracks/chrome_scroll_jank';
-import {decideTracks as scrollJankDecideTracks} from '../tracks/chrome_scroll_jank/chrome_tasks_scroll_jank_track';
-import {COUNTER_TRACK_KIND} from '../tracks/counter';
+} from '../core_plugins/chrome_scroll_jank';
+import {decideTracks as scrollJankDecideTracks} from '../core_plugins/chrome_scroll_jank/chrome_tasks_scroll_jank_track';
+import {COUNTER_TRACK_KIND} from '../core_plugins/counter';
 import {
   ACTUAL_FRAMES_SLICE_TRACK_KIND,
   EXPECTED_FRAMES_SLICE_TRACK_KIND,
-} from '../tracks/frames';
-import {decideTracks as screenshotDecideTracks} from '../tracks/screenshots';
-import {THREAD_STATE_TRACK_KIND} from '../tracks/thread_state';
-import {SLICE_TRACK_KIND} from '../tracks/chrome_slices/chrome_slice_track';
+} from '../core_plugins/frames';
+import {decideTracks as screenshotDecideTracks} from '../core_plugins/screenshots';
+import {THREAD_STATE_TRACK_KIND} from '../core_plugins/thread_state';
+import {SLICE_TRACK_KIND} from '../core_plugins/chrome_slices/chrome_slice_track';
 
 const MEM_DMA_COUNTER_NAME = 'mem.dma_heap';
 const MEM_DMA = 'mem.dma_buffer';
diff --git a/ui/src/tracks/android_log/index.ts b/ui/src/core_plugins/android_log/index.ts
index 53e6f69c6..53e6f69c6 100644
--- a/ui/src/tracks/android_log/index.ts
+++ b/ui/src/core_plugins/android_log/index.ts
diff --git a/ui/src/tracks/android_log/logs_panel.ts b/ui/src/core_plugins/android_log/logs_panel.ts
index 3970190db..3970190db 100644
--- a/ui/src/tracks/android_log/logs_panel.ts
+++ b/ui/src/core_plugins/android_log/logs_panel.ts
diff --git a/ui/src/tracks/android_log/logs_track.ts b/ui/src/core_plugins/android_log/logs_track.ts
index 1c5b3c609..1c5b3c609 100644
--- a/ui/src/tracks/android_log/logs_track.ts
+++ b/ui/src/core_plugins/android_log/logs_track.ts
diff --git a/ui/src/tracks/annotation/index.ts b/ui/src/core_plugins/annotation/index.ts
index bda66f3fd..bda66f3fd 100644
--- a/ui/src/tracks/annotation/index.ts
+++ b/ui/src/core_plugins/annotation/index.ts
diff --git a/ui/src/tracks/async_slices/async_slice_track_v2.ts b/ui/src/core_plugins/async_slices/async_slice_track_v2.ts
index 659a89aa3..659a89aa3 100644
--- a/ui/src/tracks/async_slices/async_slice_track_v2.ts
+++ b/ui/src/core_plugins/async_slices/async_slice_track_v2.ts
diff --git a/ui/src/tracks/async_slices/index.ts b/ui/src/core_plugins/async_slices/index.ts
index 644d22f24..644d22f24 100644
--- a/ui/src/tracks/async_slices/index.ts
+++ b/ui/src/core_plugins/async_slices/index.ts
diff --git a/ui/src/tracks/chrome_critical_user_interactions/index.ts b/ui/src/core_plugins/chrome_critical_user_interactions/index.ts
index faa863b3f..faa863b3f 100644
--- a/ui/src/tracks/chrome_critical_user_interactions/index.ts
+++ b/ui/src/core_plugins/chrome_critical_user_interactions/index.ts
diff --git a/ui/src/tracks/chrome_critical_user_interactions/page_load_details_panel.ts b/ui/src/core_plugins/chrome_critical_user_interactions/page_load_details_panel.ts
index 4aee5ce64..4aee5ce64 100644
--- a/ui/src/tracks/chrome_critical_user_interactions/page_load_details_panel.ts
+++ b/ui/src/core_plugins/chrome_critical_user_interactions/page_load_details_panel.ts
diff --git a/ui/src/tracks/chrome_critical_user_interactions/startup_details_panel.ts b/ui/src/core_plugins/chrome_critical_user_interactions/startup_details_panel.ts
index 431207996..431207996 100644
--- a/ui/src/tracks/chrome_critical_user_interactions/startup_details_panel.ts
+++ b/ui/src/core_plugins/chrome_critical_user_interactions/startup_details_panel.ts
diff --git a/ui/src/tracks/chrome_critical_user_interactions/web_content_interaction_details_panel.ts b/ui/src/core_plugins/chrome_critical_user_interactions/web_content_interaction_details_panel.ts
index 7cf7b48f2..7cf7b48f2 100644
--- a/ui/src/tracks/chrome_critical_user_interactions/web_content_interaction_details_panel.ts
+++ b/ui/src/core_plugins/chrome_critical_user_interactions/web_content_interaction_details_panel.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/chrome_tasks_scroll_jank_track.ts b/ui/src/core_plugins/chrome_scroll_jank/chrome_tasks_scroll_jank_track.ts
index c637994c0..c637994c0 100644
--- a/ui/src/tracks/chrome_scroll_jank/chrome_tasks_scroll_jank_track.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/chrome_tasks_scroll_jank_track.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/event_latency_details_panel.ts b/ui/src/core_plugins/chrome_scroll_jank/event_latency_details_panel.ts
index 504080239..504080239 100644
--- a/ui/src/tracks/chrome_scroll_jank/event_latency_details_panel.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/event_latency_details_panel.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts b/ui/src/core_plugins/chrome_scroll_jank/event_latency_track.ts
index 11cc6d159..11cc6d159 100644
--- a/ui/src/tracks/chrome_scroll_jank/event_latency_track.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/event_latency_track.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/index.ts b/ui/src/core_plugins/chrome_scroll_jank/index.ts
index dc59118fb..dc59118fb 100644
--- a/ui/src/tracks/chrome_scroll_jank/index.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/index.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/jank_colors.ts b/ui/src/core_plugins/chrome_scroll_jank/jank_colors.ts
index a18ea0326..a18ea0326 100644
--- a/ui/src/tracks/chrome_scroll_jank/jank_colors.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/jank_colors.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_delta_graph.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_delta_graph.ts
index d47601907..d47601907 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_delta_graph.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_delta_graph.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_details_panel.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_details_panel.ts
index d1bfb8c30..d1bfb8c30 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_details_panel.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_details_panel.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_cause_link_utils.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_cause_link_utils.ts
index 64e87849e..64e87849e 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_cause_link_utils.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_cause_link_utils.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_cause_map.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_cause_map.ts
index 383c27e5b..383c27e5b 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_cause_map.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_cause_map.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_slice.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_slice.ts
index 1ae898dbe..1ae898dbe 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_slice.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_slice.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_details_panel.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_v3_details_panel.ts
index e47e75c1e..e47e75c1e 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_details_panel.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_v3_details_panel.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_v3_track.ts
index fdb5ad1c0..fdb5ad1c0 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_jank_v3_track.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_jank_v3_track.ts
diff --git a/ui/src/tracks/chrome_scroll_jank/scroll_track.ts b/ui/src/core_plugins/chrome_scroll_jank/scroll_track.ts
index 8b475694e..8b475694e 100644
--- a/ui/src/tracks/chrome_scroll_jank/scroll_track.ts
+++ b/ui/src/core_plugins/chrome_scroll_jank/scroll_track.ts
diff --git a/ui/src/tracks/chrome_slices/chrome_slice_track.ts b/ui/src/core_plugins/chrome_slices/chrome_slice_track.ts
index c9fda8bff..c9fda8bff 100644
--- a/ui/src/tracks/chrome_slices/chrome_slice_track.ts
+++ b/ui/src/core_plugins/chrome_slices/chrome_slice_track.ts
diff --git a/ui/src/tracks/chrome_slices/index.ts b/ui/src/core_plugins/chrome_slices/index.ts
index 830b7e4e9..830b7e4e9 100644
--- a/ui/src/tracks/chrome_slices/index.ts
+++ b/ui/src/core_plugins/chrome_slices/index.ts
diff --git a/ui/src/tracks/counter/index.ts b/ui/src/core_plugins/counter/index.ts
index 55773cd87..55773cd87 100644
--- a/ui/src/tracks/counter/index.ts
+++ b/ui/src/core_plugins/counter/index.ts
diff --git a/ui/src/tracks/cpu_freq/index.ts b/ui/src/core_plugins/cpu_freq/index.ts
index b5fa5fa4b..b5fa5fa4b 100644
--- a/ui/src/tracks/cpu_freq/index.ts
+++ b/ui/src/core_plugins/cpu_freq/index.ts
diff --git a/ui/src/tracks/cpu_profile/index.ts b/ui/src/core_plugins/cpu_profile/index.ts
index 4d3e87fd9..4d3e87fd9 100644
--- a/ui/src/tracks/cpu_profile/index.ts
+++ b/ui/src/core_plugins/cpu_profile/index.ts
diff --git a/ui/src/tracks/cpu_slices/index.ts b/ui/src/core_plugins/cpu_slices/index.ts
index 139bac5c3..139bac5c3 100644
--- a/ui/src/tracks/cpu_slices/index.ts
+++ b/ui/src/core_plugins/cpu_slices/index.ts
diff --git a/ui/src/tracks/custom_sql_table_slices/index.ts b/ui/src/core_plugins/custom_sql_table_slices/index.ts
index 72f20753e..72f20753e 100644
--- a/ui/src/tracks/custom_sql_table_slices/index.ts
+++ b/ui/src/core_plugins/custom_sql_table_slices/index.ts
diff --git a/ui/src/tracks/debug/add_debug_track_menu.ts b/ui/src/core_plugins/debug/add_debug_track_menu.ts
index e03c9f225..e03c9f225 100644
--- a/ui/src/tracks/debug/add_debug_track_menu.ts
+++ b/ui/src/core_plugins/debug/add_debug_track_menu.ts
diff --git a/ui/src/tracks/debug/counter_track.ts b/ui/src/core_plugins/debug/counter_track.ts
index 5b37e3d1b..5b37e3d1b 100644
--- a/ui/src/tracks/debug/counter_track.ts
+++ b/ui/src/core_plugins/debug/counter_track.ts
diff --git a/ui/src/tracks/debug/details_tab.ts b/ui/src/core_plugins/debug/details_tab.ts
index 659c48ccf..659c48ccf 100644
--- a/ui/src/tracks/debug/details_tab.ts
+++ b/ui/src/core_plugins/debug/details_tab.ts
diff --git a/ui/src/tracks/debug/index.ts b/ui/src/core_plugins/debug/index.ts
index fad9caedb..fad9caedb 100644
--- a/ui/src/tracks/debug/index.ts
+++ b/ui/src/core_plugins/debug/index.ts
diff --git a/ui/src/tracks/debug/slice_track.ts b/ui/src/core_plugins/debug/slice_track.ts
index a53e4dcf1..a53e4dcf1 100644
--- a/ui/src/tracks/debug/slice_track.ts
+++ b/ui/src/core_plugins/debug/slice_track.ts
diff --git a/ui/src/tracks/frames/actual_frames_track_v2.ts b/ui/src/core_plugins/frames/actual_frames_track_v2.ts
index 6ce0e3d51..6ce0e3d51 100644
--- a/ui/src/tracks/frames/actual_frames_track_v2.ts
+++ b/ui/src/core_plugins/frames/actual_frames_track_v2.ts
diff --git a/ui/src/tracks/frames/expected_frames_track_v2.ts b/ui/src/core_plugins/frames/expected_frames_track_v2.ts
index ce602a1dd..ce602a1dd 100644
--- a/ui/src/tracks/frames/expected_frames_track_v2.ts
+++ b/ui/src/core_plugins/frames/expected_frames_track_v2.ts
diff --git a/ui/src/tracks/frames/index.ts b/ui/src/core_plugins/frames/index.ts
index 2cc877f29..2cc877f29 100644
--- a/ui/src/tracks/frames/index.ts
+++ b/ui/src/core_plugins/frames/index.ts
diff --git a/ui/src/tracks/ftrace/common.ts b/ui/src/core_plugins/ftrace/common.ts
index 772ba1691..772ba1691 100644
--- a/ui/src/tracks/ftrace/common.ts
+++ b/ui/src/core_plugins/ftrace/common.ts
diff --git a/ui/src/tracks/ftrace/ftrace_explorer.ts b/ui/src/core_plugins/ftrace/ftrace_explorer.ts
index d8cad7838..d8cad7838 100644
--- a/ui/src/tracks/ftrace/ftrace_explorer.ts
+++ b/ui/src/core_plugins/ftrace/ftrace_explorer.ts
diff --git a/ui/src/tracks/ftrace/ftrace_track.ts b/ui/src/core_plugins/ftrace/ftrace_track.ts
index 6950eca4f..6950eca4f 100644
--- a/ui/src/tracks/ftrace/ftrace_track.ts
+++ b/ui/src/core_plugins/ftrace/ftrace_track.ts
diff --git a/ui/src/tracks/ftrace/index.ts b/ui/src/core_plugins/ftrace/index.ts
index 3cc06162b..3cc06162b 100644
--- a/ui/src/tracks/ftrace/index.ts
+++ b/ui/src/core_plugins/ftrace/index.ts
diff --git a/ui/src/tracks/heap_profile/index.ts b/ui/src/core_plugins/heap_profile/index.ts
index 512af1a81..512af1a81 100644
--- a/ui/src/tracks/heap_profile/index.ts
+++ b/ui/src/core_plugins/heap_profile/index.ts
diff --git a/ui/src/tracks/perf_samples_profile/index.ts b/ui/src/core_plugins/perf_samples_profile/index.ts
index 752684a89..752684a89 100644
--- a/ui/src/tracks/perf_samples_profile/index.ts
+++ b/ui/src/core_plugins/perf_samples_profile/index.ts
diff --git a/ui/src/tracks/process_summary/index.ts b/ui/src/core_plugins/process_summary/index.ts
index ea6845f31..ea6845f31 100644
--- a/ui/src/tracks/process_summary/index.ts
+++ b/ui/src/core_plugins/process_summary/index.ts
diff --git a/ui/src/tracks/process_summary/process_scheduling_track.ts b/ui/src/core_plugins/process_summary/process_scheduling_track.ts
index 9725c2914..9725c2914 100644
--- a/ui/src/tracks/process_summary/process_scheduling_track.ts
+++ b/ui/src/core_plugins/process_summary/process_scheduling_track.ts
diff --git a/ui/src/tracks/process_summary/process_summary_track.ts b/ui/src/core_plugins/process_summary/process_summary_track.ts
index 7acf36bf8..7acf36bf8 100644
--- a/ui/src/tracks/process_summary/process_summary_track.ts
+++ b/ui/src/core_plugins/process_summary/process_summary_track.ts
diff --git a/ui/src/tracks/sched/active_cpu_count.ts b/ui/src/core_plugins/sched/active_cpu_count.ts
index 721a8841c..721a8841c 100644
--- a/ui/src/tracks/sched/active_cpu_count.ts
+++ b/ui/src/core_plugins/sched/active_cpu_count.ts
diff --git a/ui/src/tracks/sched/index.ts b/ui/src/core_plugins/sched/index.ts
index ccebaa1e6..ccebaa1e6 100644
--- a/ui/src/tracks/sched/index.ts
+++ b/ui/src/core_plugins/sched/index.ts
diff --git a/ui/src/tracks/sched/runnable_thread_count.ts b/ui/src/core_plugins/sched/runnable_thread_count.ts
index f5ab7ca46..f5ab7ca46 100644
--- a/ui/src/tracks/sched/runnable_thread_count.ts
+++ b/ui/src/core_plugins/sched/runnable_thread_count.ts
diff --git a/ui/src/tracks/screenshots/index.ts b/ui/src/core_plugins/screenshots/index.ts
index 029f818f3..029f818f3 100644
--- a/ui/src/tracks/screenshots/index.ts
+++ b/ui/src/core_plugins/screenshots/index.ts
diff --git a/ui/src/tracks/screenshots/screenshot_panel.ts b/ui/src/core_plugins/screenshots/screenshot_panel.ts
index 066d14c18..066d14c18 100644
--- a/ui/src/tracks/screenshots/screenshot_panel.ts
+++ b/ui/src/core_plugins/screenshots/screenshot_panel.ts
diff --git a/ui/src/tracks/thread_state/index.ts b/ui/src/core_plugins/thread_state/index.ts
index 73e2faf1c..73e2faf1c 100644
--- a/ui/src/tracks/thread_state/index.ts
+++ b/ui/src/core_plugins/thread_state/index.ts
diff --git a/ui/src/tracks/thread_state/thread_state_v2.ts b/ui/src/core_plugins/thread_state/thread_state_v2.ts
index 1d0b31f2f..1d0b31f2f 100644
--- a/ui/src/tracks/thread_state/thread_state_v2.ts
+++ b/ui/src/core_plugins/thread_state/thread_state_v2.ts
diff --git a/ui/src/tracks/visualised_args/index.ts b/ui/src/core_plugins/visualised_args/index.ts
index 459a7ad4a..459a7ad4a 100644
--- a/ui/src/tracks/visualised_args/index.ts
+++ b/ui/src/core_plugins/visualised_args/index.ts
diff --git a/ui/src/tracks/visualised_args/visualized_args_track.ts b/ui/src/core_plugins/visualised_args/visualized_args_track.ts
index 8de85d34f..8de85d34f 100644
--- a/ui/src/tracks/visualised_args/visualized_args_track.ts
+++ b/ui/src/core_plugins/visualised_args/visualized_args_track.ts
diff --git a/ui/src/frontend/app.ts b/ui/src/frontend/app.ts
index ddc682625..92301b715 100644
--- a/ui/src/frontend/app.ts
+++ b/ui/src/frontend/app.ts
@@ -33,7 +33,7 @@ import {
 import {raf} from '../core/raf_scheduler';
 import {Command} from '../public';
 import {EngineProxy} from '../trace_processor/engine';
-import {THREAD_STATE_TRACK_KIND} from '../tracks/thread_state';
+import {THREAD_STATE_TRACK_KIND} from '../core_plugins/thread_state';
 import {HotkeyConfig, HotkeyContext} from '../widgets/hotkey_context';
 import {HotkeyGlyphs} from '../widgets/hotkey_glyphs';
 import {maybeRenderFullscreenModalDialog} from '../widgets/modal';
diff --git a/ui/src/frontend/debug_tracks.ts b/ui/src/frontend/debug_tracks.ts
index 0a39612c8..ed77bf0da 100644
--- a/ui/src/frontend/debug_tracks.ts
+++ b/ui/src/frontend/debug_tracks.ts
@@ -17,7 +17,7 @@ import {Actions, DeferredAction} from '../common/actions';
 import {SCROLLING_TRACK_GROUP} from '../common/state';
 import {globals} from './globals';
 import {EngineProxy, PrimaryTrackSortKey} from '../public';
-import {DebugTrackV2Config} from '../tracks/debug/slice_track';
+import {DebugTrackV2Config} from '../core_plugins/debug/slice_track';
 
 export const ARG_PREFIX = 'arg_';
 export const DEBUG_SLICE_TRACK_URI = 'perfetto.DebugSlices';
diff --git a/ui/src/frontend/index.ts b/ui/src/frontend/index.ts
index 468d9afee..b667882aa 100644
--- a/ui/src/frontend/index.ts
+++ b/ui/src/frontend/index.ts
@@ -15,6 +15,7 @@
 // Keep this import first.
 import '../base/static_initializers';
 import '../gen/all_plugins';
+import '../gen/all_core_plugins';
 
 import {Draft} from 'immer';
 import m from 'mithril';
diff --git a/ui/src/frontend/query_result_tab.ts b/ui/src/frontend/query_result_tab.ts
index 23b51487a..7fe7b2d10 100644
--- a/ui/src/frontend/query_result_tab.ts
+++ b/ui/src/frontend/query_result_tab.ts
@@ -22,7 +22,7 @@ import {QueryError} from '../trace_processor/query_result';
 import {
   AddDebugTrackMenu,
   uuidToViewName,
-} from '../tracks/debug/add_debug_track_menu';
+} from '../core_plugins/debug/add_debug_track_menu';
 import {Button} from '../widgets/button';
 import {PopupMenu2} from '../widgets/menu';
 import {PopupPosition} from '../widgets/popup';
diff --git a/ui/src/frontend/simple_slice_track.ts b/ui/src/frontend/simple_slice_track.ts
index 6d287b341..f46812fad 100644
--- a/ui/src/frontend/simple_slice_track.ts
+++ b/ui/src/frontend/simple_slice_track.ts
@@ -17,12 +17,12 @@ import {
   CustomSqlDetailsPanelConfig,
   CustomSqlTableDefConfig,
   CustomSqlTableSliceTrack,
-} from '../tracks/custom_sql_table_slices';
+} from '../core_plugins/custom_sql_table_slices';
 import {NamedSliceTrackTypes} from './named_slice_track';
 import {ARG_PREFIX, SliceColumns, SqlDataSource} from './debug_tracks';
 import {uuidv4Sql} from '../base/uuid';
 import {DisposableCallback} from '../base/disposable';
-import {DebugSliceDetailsTab} from '../tracks/debug/details_tab';
+import {DebugSliceDetailsTab} from '../core_plugins/debug/details_tab';
 
 export interface SimpleSliceTrackConfig {
   data: SqlDataSource;
diff --git a/ui/src/frontend/slice_details_panel.ts b/ui/src/frontend/slice_details_panel.ts
index fb5d3a25d..3887577ac 100644
--- a/ui/src/frontend/slice_details_panel.ts
+++ b/ui/src/frontend/slice_details_panel.ts
@@ -16,7 +16,7 @@ import m from 'mithril';
 
 import {Actions} from '../common/actions';
 import {translateState} from '../common/thread_state';
-import {THREAD_STATE_TRACK_KIND} from '../tracks/thread_state';
+import {THREAD_STATE_TRACK_KIND} from '../core_plugins/thread_state';
 import {Anchor} from '../widgets/anchor';
 import {DetailsShell} from '../widgets/details_shell';
 import {GridLayout} from '../widgets/grid_layout';
diff --git a/ui/src/frontend/sql_table/tab.ts b/ui/src/frontend/sql_table/tab.ts
index ea173a0b7..42673311b 100644
--- a/ui/src/frontend/sql_table/tab.ts
+++ b/ui/src/frontend/sql_table/tab.ts
@@ -17,7 +17,7 @@ import m from 'mithril';
 import {copyToClipboard} from '../../base/clipboard';
 import {Icons} from '../../base/semantic_icons';
 import {exists} from '../../base/utils';
-import {AddDebugTrackMenu} from '../../tracks/debug/add_debug_track_menu';
+import {AddDebugTrackMenu} from '../../core_plugins/debug/add_debug_track_menu';
 import {Button} from '../../widgets/button';
 import {DetailsShell} from '../../widgets/details_shell';
 import {Popup, PopupPosition} from '../../widgets/popup';
diff --git a/ui/src/frontend/thread_state.ts b/ui/src/frontend/thread_state.ts
index 8b0d520f5..e912a7ed8 100644
--- a/ui/src/frontend/thread_state.ts
+++ b/ui/src/frontend/thread_state.ts
@@ -21,8 +21,8 @@ import {Actions} from '../common/actions';
 import {translateState} from '../common/thread_state';
 import {EngineProxy} from '../trace_processor/engine';
 import {LONG, NUM, NUM_NULL, STR_NULL} from '../trace_processor/query_result';
-import {CPU_SLICE_TRACK_KIND} from '../tracks/cpu_slices';
-import {THREAD_STATE_TRACK_KIND} from '../tracks/thread_state';
+import {CPU_SLICE_TRACK_KIND} from '../core_plugins/cpu_slices';
+import {THREAD_STATE_TRACK_KIND} from '../core_plugins/thread_state';
 import {Anchor} from '../widgets/anchor';
 
 import {globals} from './globals';
diff --git a/ui/src/plugins/org.kernel.LinuxKernelDevices/index.ts b/ui/src/plugins/org.kernel.LinuxKernelDevices/index.ts
index b9127f0ce..eca39b477 100644
--- a/ui/src/plugins/org.kernel.LinuxKernelDevices/index.ts
+++ b/ui/src/plugins/org.kernel.LinuxKernelDevices/index.ts
@@ -19,8 +19,8 @@ import {
   PluginDescriptor,
   STR_NULL,
 } from '../../public';
-import {ASYNC_SLICE_TRACK_KIND} from '../../tracks/async_slices';
-import {AsyncSliceTrackV2} from '../../tracks/async_slices/async_slice_track_v2';
+import {ASYNC_SLICE_TRACK_KIND} from '../../core_plugins/async_slices';
+import {AsyncSliceTrackV2} from '../../core_plugins/async_slices/async_slice_track_v2';
 
 // This plugin renders visualizations of runtime power state transitions for
 // Linux kernel devices (devices managed by Linux drivers).