tp: reorganize startup metric
This prepares the metric for backporting to API 23.
Change-Id: I4f96954ba2fcf0d66bc7d3fbdadc53e9cb599e85
Bug: 190219056
diff --git a/Android.bp b/Android.bp
index 1908394..1887b50 100644
--- a/Android.bp
+++ b/Android.bp
@@ -8014,7 +8014,6 @@
"src/trace_processor/metrics/android/android_proxy_power.sql",
"src/trace_processor/metrics/android/android_simpleperf.sql",
"src/trace_processor/metrics/android/android_startup.sql",
- "src/trace_processor/metrics/android/android_startup_launches.sql",
"src/trace_processor/metrics/android/android_surfaceflinger.sql",
"src/trace_processor/metrics/android/android_sysui_cuj.sql",
"src/trace_processor/metrics/android/android_sysui_cuj_jank_query.sql",
@@ -8030,7 +8029,6 @@
"src/trace_processor/metrics/android/g2d_duration.sql",
"src/trace_processor/metrics/android/global_counter_span_view.sql",
"src/trace_processor/metrics/android/gpu_counter_span_view.sql",
- "src/trace_processor/metrics/android/hsc_startups.sql",
"src/trace_processor/metrics/android/java_heap_histogram.sql",
"src/trace_processor/metrics/android/java_heap_stats.sql",
"src/trace_processor/metrics/android/mem_stats_priority_breakdown.sql",
@@ -8043,6 +8041,8 @@
"src/trace_processor/metrics/android/process_unagg_mem_view.sql",
"src/trace_processor/metrics/android/profiler_smaps.sql",
"src/trace_processor/metrics/android/span_view_stats.sql",
+ "src/trace_processor/metrics/android/startup/hsc.sql",
+ "src/trace_processor/metrics/android/startup/launches.sql",
"src/trace_processor/metrics/android/thread_counter_span_view.sql",
"src/trace_processor/metrics/android/unsymbolized_frames.sql",
"src/trace_processor/metrics/chrome/actual_power_by_category.sql",