From 5cc7b6c3ea5fd76111920fec8803712e06fda98c Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 7 Jun 2021 10:33:00 -0700 Subject: [PATCH] Add option to stream logs to file for flutter logs and way to use it in devicelab runs (#84008) --- .../bin/tasks/android_defines_test.dart | 2 +- .../android_semantics_integration_test.dart | 2 +- .../bin/tasks/android_stack_size_test.dart | 2 +- ...id_view_scroll_perf__timeline_summary.dart | 2 +- .../bin/tasks/animated_image_gc_perf.dart | 2 +- ...nimated_placeholder_perf__e2e_summary.dart | 2 +- ...microtasks_perf_ios__timeline_summary.dart | 2 +- .../backdrop_filter_perf__e2e_summary.dart | 2 +- ...ackdrop_filter_perf__timeline_summary.dart | 2 +- ...rop_filter_perf_ios__timeline_summary.dart | 2 +- .../basic_material_app_android__compile.dart | 2 +- .../basic_material_app_ios__compile.dart | 2 +- .../basic_material_app_win__compile.dart | 2 +- dev/devicelab/bin/tasks/build_mode_test.dart | 2 +- .../bin/tasks/channels_integration_test.dart | 2 +- .../tasks/channels_integration_test_ios.dart | 2 +- .../tasks/channels_integration_test_win.dart | 2 +- .../bin/tasks/codegen_integration_linux.dart | 2 +- .../bin/tasks/codegen_integration_mac.dart | 2 +- .../bin/tasks/codegen_integration_win.dart | 2 +- ...lor_filter_and_fade_perf__e2e_summary.dart | 2 +- ...ilter_and_fade_perf__timeline_summary.dart | 2 +- .../bin/tasks/complex_layout__start_up.dart | 2 +- .../complex_layout_android__compile.dart | 2 +- ...lex_layout_android__scroll_smoothness.dart | 2 +- .../tasks/complex_layout_ios__compile.dart | 2 +- .../tasks/complex_layout_ios__start_up.dart | 2 +- ...x_layout_scroll_perf__devtools_memory.dart | 2 +- .../complex_layout_scroll_perf__memory.dart | 2 +- ..._layout_scroll_perf__timeline_summary.dart | 2 +- ...out_scroll_perf_ios__timeline_summary.dart | 2 +- .../tasks/complex_layout_semantics_perf.dart | 2 +- .../tasks/complex_layout_win__compile.dart | 2 +- .../tasks/cubic_bezier_perf__e2e_summary.dart | 2 +- .../cubic_bezier_perf__timeline_summary.dart | 2 +- ..._bezier_perf_sksl_warmup__e2e_summary.dart | 2 +- ...er_perf_sksl_warmup__timeline_summary.dart | 2 +- .../tasks/cull_opacity_perf__e2e_summary.dart | 2 +- .../cull_opacity_perf__timeline_summary.dart | 2 +- .../tasks/devtools_profile_start_test.dart | 2 +- .../bin/tasks/drive_perf_debug_warning.dart | 2 +- ...bedded_android_views_integration_test.dart | 2 +- .../tasks/external_ui_integration_test.dart | 2 +- .../external_ui_integration_test_ios.dart | 2 +- ...hild_animation_perf__timeline_summary.dart | 2 +- .../fast_scroll_heavy_gridview__memory.dart | 2 +- .../fast_scroll_large_images__memory.dart | 2 +- dev/devicelab/bin/tasks/flavors_test.dart | 2 +- dev/devicelab/bin/tasks/flavors_test_ios.dart | 2 +- dev/devicelab/bin/tasks/flavors_test_win.dart | 2 +- .../tasks/flutter_attach_test_fuchsia.dart | 2 +- .../flutter_engine_group_performance.dart | 2 +- .../flutter_gallery__back_button_memory.dart | 2 +- .../bin/tasks/flutter_gallery__start_up.dart | 2 +- .../flutter_gallery__transition_perf.dart | 2 +- .../flutter_gallery__transition_perf_e2e.dart | 2 +- ...tter_gallery__transition_perf_e2e_ios.dart | 2 +- ...er_gallery__transition_perf_e2e_ios32.dart | 2 +- ...utter_gallery__transition_perf_hybrid.dart | 2 +- ...llery__transition_perf_with_semantics.dart | 2 +- .../flutter_gallery_android__compile.dart | 2 +- .../flutter_gallery_instrumentation_test.dart | 2 +- .../tasks/flutter_gallery_ios__compile.dart | 2 +- .../tasks/flutter_gallery_ios__start_up.dart | 2 +- .../flutter_gallery_ios__transition_perf.dart | 2 +- ..._gallery_sksl_warmup__transition_perf.dart | 2 +- ...lery_sksl_warmup__transition_perf_e2e.dart | 2 +- .../tasks/flutter_gallery_win__compile.dart | 2 +- dev/devicelab/bin/tasks/flutter_run_test.dart | 2 +- .../bin/tasks/flutter_view__start_up.dart | 2 +- .../bin/tasks/flutter_view_ios__start_up.dart | 2 +- .../frame_policy_delay_test_android.dart | 2 +- .../bin/tasks/fullscreen_textfield_perf.dart | 2 +- ...ullscreen_textfield_perf__e2e_summary.dart | 2 +- ...reen_textfield_perf__timeline_summary.dart | 2 +- .../tasks/hello_world_android__compile.dart | 2 +- .../bin/tasks/hello_world_ios__compile.dart | 2 +- .../home_scroll_perf__timeline_summary.dart | 2 +- ...hybrid_android_views_integration_test.dart | 2 +- ...form_animation_perf__timeline_summary.dart | 2 +- .../bin/tasks/integration_test_test.dart | 2 +- .../bin/tasks/integration_test_test_ios.dart | 2 +- .../bin/tasks/integration_ui_driver.dart | 2 +- .../bin/tasks/integration_ui_ios_driver.dart | 2 +- .../integration_ui_ios_keyboard_resize.dart | 2 +- .../tasks/integration_ui_ios_screenshot.dart | 2 +- .../tasks/integration_ui_ios_textfield.dart | 2 +- .../tasks/integration_ui_keyboard_resize.dart | 2 +- .../bin/tasks/integration_ui_screenshot.dart | 2 +- .../bin/tasks/integration_ui_textfield.dart | 2 +- dev/devicelab/bin/tasks/ios_defines_test.dart | 2 +- .../bin/tasks/ios_platform_view_tests.dart | 2 +- .../large_image_changer_perf_android.dart | 2 +- .../tasks/large_image_changer_perf_ios.dart | 2 +- dev/devicelab/bin/tasks/microbenchmarks.dart | 2 +- .../bin/tasks/microbenchmarks_ios.dart | 2 +- ...widget_construction_perf__e2e_summary.dart | 2 +- .../bin/tasks/native_ui_tests_ios32.dart | 2 +- .../bin/tasks/new_gallery__crane_perf.dart | 2 +- .../tasks/new_gallery__transition_perf.dart | 2 +- .../new_gallery_ios__transition_perf.dart | 2 +- .../picture_cache_perf__e2e_summary.dart | 2 +- .../picture_cache_perf__timeline_summary.dart | 2 +- .../tasks/platform_channel_sample_test.dart | 2 +- .../platform_channel_sample_test_ios.dart | 2 +- .../platform_channel_sample_test_swift.dart | 2 +- .../tasks/platform_channels_benchmarks.dart | 2 +- .../platform_channels_benchmarks_ios.dart | 2 +- .../bin/tasks/platform_interaction_test.dart | 2 +- .../tasks/platform_interaction_test_ios.dart | 2 +- .../bin/tasks/platform_view__start_up.dart | 2 +- .../tasks/platform_view_ios__start_up.dart | 2 +- ...m_views_scroll_perf__timeline_summary.dart | 2 +- ...ews_scroll_perf_ios__timeline_summary.dart | 2 +- ...rop_filter_perf_ios__timeline_summary.dart | 2 +- dev/devicelab/bin/tasks/routing_test.dart | 2 +- dev/devicelab/bin/tasks/run_release_test.dart | 2 +- .../bin/tasks/service_extensions_test.dart | 2 +- .../bin/tasks/simple_animation_perf_ios.dart | 2 +- ...ina_hot_mode_dev_cycle_ios__benchmark.dart | 2 +- .../bin/tasks/smoke_test_build_test.dart | 2 +- .../bin/tasks/smoke_test_device.dart | 2 +- dev/devicelab/bin/tasks/textfield_perf.dart | 2 +- .../tasks/textfield_perf__e2e_summary.dart | 2 +- .../textfield_perf__timeline_summary.dart | 2 +- .../tiles_scroll_perf__timeline_summary.dart | 2 +- ...les_scroll_perf_ios__timeline_summary.dart | 2 +- ...croll_perf_iphonexs__timeline_summary.dart | 2 +- .../lib/framework/{adb.dart => devices.dart} | 120 +++++++++++++++++- dev/devicelab/lib/framework/framework.dart | 35 ++++- dev/devicelab/lib/framework/host_agent.dart | 9 +- dev/devicelab/lib/framework/runner.dart | 2 +- dev/devicelab/lib/framework/utils.dart | 14 +- dev/devicelab/lib/microbenchmarks.dart | 13 -- dev/devicelab/lib/tasks/build_test_task.dart | 2 +- dev/devicelab/lib/tasks/gallery.dart | 2 +- dev/devicelab/lib/tasks/hot_mode_tests.dart | 2 +- .../lib/tasks/integration_tests.dart | 2 +- dev/devicelab/lib/tasks/microbenchmarks.dart | 4 +- dev/devicelab/lib/tasks/perf_tests.dart | 2 +- .../tasks/platform_channels_benchmarks.dart | 6 +- dev/devicelab/test/adb_test.dart | 2 +- dev/devicelab/test/host_agent_test.dart | 10 +- 143 files changed, 306 insertions(+), 175 deletions(-) rename dev/devicelab/lib/framework/{adb.dart => devices.dart} (88%) diff --git a/dev/devicelab/bin/tasks/android_defines_test.dart b/dev/devicelab/bin/tasks/android_defines_test.dart index 94b303f7657..9774212a1de 100644 --- a/dev/devicelab/bin/tasks/android_defines_test.dart +++ b/dev/devicelab/bin/tasks/android_defines_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/android_semantics_integration_test.dart b/dev/devicelab/bin/tasks/android_semantics_integration_test.dart index cb50789b6b9..d2ce3e47f7d 100644 --- a/dev/devicelab/bin/tasks/android_semantics_integration_test.dart +++ b/dev/devicelab/bin/tasks/android_semantics_integration_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/android_stack_size_test.dart b/dev/devicelab/bin/tasks/android_stack_size_test.dart index 2c7764444ab..546aef2d79c 100644 --- a/dev/devicelab/bin/tasks/android_stack_size_test.dart +++ b/dev/devicelab/bin/tasks/android_stack_size_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/android_view_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/android_view_scroll_perf__timeline_summary.dart index 5df92c72a39..22e2df478fb 100644 --- a/dev/devicelab/bin/tasks/android_view_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/android_view_scroll_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/animated_image_gc_perf.dart b/dev/devicelab/bin/tasks/animated_image_gc_perf.dart index bdb2deb5356..65f456ee304 100644 --- a/dev/devicelab/bin/tasks/animated_image_gc_perf.dart +++ b/dev/devicelab/bin/tasks/animated_image_gc_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/animated_placeholder_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/animated_placeholder_perf__e2e_summary.dart index 5c0f2d39acf..ec033b3bff6 100644 --- a/dev/devicelab/bin/tasks/animated_placeholder_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/animated_placeholder_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/animation_with_microtasks_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/animation_with_microtasks_perf_ios__timeline_summary.dart index 65ca71869b2..c84450eda72 100644 --- a/dev/devicelab/bin/tasks/animation_with_microtasks_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/animation_with_microtasks_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/backdrop_filter_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/backdrop_filter_perf__e2e_summary.dart index b49eb7bc346..49b216f5154 100644 --- a/dev/devicelab/bin/tasks/backdrop_filter_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/backdrop_filter_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/backdrop_filter_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/backdrop_filter_perf__timeline_summary.dart index d3e4ff9d696..db1ec8f7b91 100644 --- a/dev/devicelab/bin/tasks/backdrop_filter_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/backdrop_filter_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart index 78c05bdff90..354d3694ea2 100644 --- a/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/backdrop_filter_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/basic_material_app_android__compile.dart b/dev/devicelab/bin/tasks/basic_material_app_android__compile.dart index b56736514f8..6b93fad7d7a 100644 --- a/dev/devicelab/bin/tasks/basic_material_app_android__compile.dart +++ b/dev/devicelab/bin/tasks/basic_material_app_android__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart b/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart index 283f5c424de..e503d0a5edf 100644 --- a/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart +++ b/dev/devicelab/bin/tasks/basic_material_app_ios__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart b/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart index b56736514f8..6b93fad7d7a 100644 --- a/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart +++ b/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/build_mode_test.dart b/dev/devicelab/bin/tasks/build_mode_test.dart index 3f5f90c9f30..23f739bab54 100644 --- a/dev/devicelab/bin/tasks/build_mode_test.dart +++ b/dev/devicelab/bin/tasks/build_mode_test.dart @@ -9,7 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/channels_integration_test.dart b/dev/devicelab/bin/tasks/channels_integration_test.dart index a839f1b2b5f..e842be1b6c9 100644 --- a/dev/devicelab/bin/tasks/channels_integration_test.dart +++ b/dev/devicelab/bin/tasks/channels_integration_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/channels_integration_test_ios.dart b/dev/devicelab/bin/tasks/channels_integration_test_ios.dart index fd61f0f89e4..9445f9b1bb1 100644 --- a/dev/devicelab/bin/tasks/channels_integration_test_ios.dart +++ b/dev/devicelab/bin/tasks/channels_integration_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/channels_integration_test_win.dart b/dev/devicelab/bin/tasks/channels_integration_test_win.dart index a839f1b2b5f..e842be1b6c9 100644 --- a/dev/devicelab/bin/tasks/channels_integration_test_win.dart +++ b/dev/devicelab/bin/tasks/channels_integration_test_win.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/codegen_integration_linux.dart b/dev/devicelab/bin/tasks/codegen_integration_linux.dart index 98e28b1a9f8..f7dae49a44d 100644 --- a/dev/devicelab/bin/tasks/codegen_integration_linux.dart +++ b/dev/devicelab/bin/tasks/codegen_integration_linux.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/codegen_integration_mac.dart b/dev/devicelab/bin/tasks/codegen_integration_mac.dart index b24066eb4cd..2501d7b7b79 100644 --- a/dev/devicelab/bin/tasks/codegen_integration_mac.dart +++ b/dev/devicelab/bin/tasks/codegen_integration_mac.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/codegen_integration_win.dart b/dev/devicelab/bin/tasks/codegen_integration_win.dart index 98e28b1a9f8..f7dae49a44d 100644 --- a/dev/devicelab/bin/tasks/codegen_integration_win.dart +++ b/dev/devicelab/bin/tasks/codegen_integration_win.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/color_filter_and_fade_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/color_filter_and_fade_perf__e2e_summary.dart index 13a82a72e53..e63db6ecfee 100644 --- a/dev/devicelab/bin/tasks/color_filter_and_fade_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/color_filter_and_fade_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/color_filter_and_fade_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/color_filter_and_fade_perf__timeline_summary.dart index 8bb259c340a..62439a7eb46 100644 --- a/dev/devicelab/bin/tasks/color_filter_and_fade_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/color_filter_and_fade_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout__start_up.dart b/dev/devicelab/bin/tasks/complex_layout__start_up.dart index 4881f4d6bd3..c05c700cb2c 100644 --- a/dev/devicelab/bin/tasks/complex_layout__start_up.dart +++ b/dev/devicelab/bin/tasks/complex_layout__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_android__compile.dart b/dev/devicelab/bin/tasks/complex_layout_android__compile.dart index a1c09d01043..41ad9847cc2 100644 --- a/dev/devicelab/bin/tasks/complex_layout_android__compile.dart +++ b/dev/devicelab/bin/tasks/complex_layout_android__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_android__scroll_smoothness.dart b/dev/devicelab/bin/tasks/complex_layout_android__scroll_smoothness.dart index 5195dc93ead..0503f776481 100644 --- a/dev/devicelab/bin/tasks/complex_layout_android__scroll_smoothness.dart +++ b/dev/devicelab/bin/tasks/complex_layout_android__scroll_smoothness.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_ios__compile.dart b/dev/devicelab/bin/tasks/complex_layout_ios__compile.dart index d299c8a4eff..36fd39a2846 100644 --- a/dev/devicelab/bin/tasks/complex_layout_ios__compile.dart +++ b/dev/devicelab/bin/tasks/complex_layout_ios__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart b/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart index 45c10a3cc09..4548bffb38d 100644 --- a/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/complex_layout_ios__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__devtools_memory.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__devtools_memory.dart index f984c058858..94f0614f99e 100644 --- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__devtools_memory.dart +++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__devtools_memory.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__memory.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__memory.dart index 484748eff10..8b0146fb7bf 100644 --- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__memory.dart +++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__memory.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__timeline_summary.dart index e84943aa585..95cb14fce0b 100644 --- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart index 3e4bc997250..b9a3cd7dd85 100644 --- a/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_semantics_perf.dart b/dev/devicelab/bin/tasks/complex_layout_semantics_perf.dart index 10e8d17d364..1dc64b53634 100644 --- a/dev/devicelab/bin/tasks/complex_layout_semantics_perf.dart +++ b/dev/devicelab/bin/tasks/complex_layout_semantics_perf.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/host_agent.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/complex_layout_win__compile.dart b/dev/devicelab/bin/tasks/complex_layout_win__compile.dart index a1c09d01043..41ad9847cc2 100644 --- a/dev/devicelab/bin/tasks/complex_layout_win__compile.dart +++ b/dev/devicelab/bin/tasks/complex_layout_win__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cubic_bezier_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/cubic_bezier_perf__e2e_summary.dart index 8f6922a5e18..4dfb8c5237e 100644 --- a/dev/devicelab/bin/tasks/cubic_bezier_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/cubic_bezier_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cubic_bezier_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/cubic_bezier_perf__timeline_summary.dart index 7d1d4c8cdd4..352f559110c 100644 --- a/dev/devicelab/bin/tasks/cubic_bezier_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/cubic_bezier_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__e2e_summary.dart b/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__e2e_summary.dart index 04c87c6c655..0bad40559a1 100644 --- a/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__timeline_summary.dart b/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__timeline_summary.dart index c110499a197..ae086b49287 100644 --- a/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cull_opacity_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/cull_opacity_perf__e2e_summary.dart index 529986a7559..2e6adeca8bc 100644 --- a/dev/devicelab/bin/tasks/cull_opacity_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/cull_opacity_perf__e2e_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart index b9219ff41ea..b51ded429c7 100644 --- a/dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/devtools_profile_start_test.dart b/dev/devicelab/bin/tasks/devtools_profile_start_test.dart index 8c74fd7164c..5d1f8afe4fd 100644 --- a/dev/devicelab/bin/tasks/devtools_profile_start_test.dart +++ b/dev/devicelab/bin/tasks/devtools_profile_start_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/drive_perf_debug_warning.dart b/dev/devicelab/bin/tasks/drive_perf_debug_warning.dart index 051e51dede5..981e413c6f3 100644 --- a/dev/devicelab/bin/tasks/drive_perf_debug_warning.dart +++ b/dev/devicelab/bin/tasks/drive_perf_debug_warning.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/host_agent.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart b/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart index cfe342404b7..8bf3425e8ce 100644 --- a/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart +++ b/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/external_ui_integration_test.dart b/dev/devicelab/bin/tasks/external_ui_integration_test.dart index 3e96e10c2cc..793bd5c719b 100644 --- a/dev/devicelab/bin/tasks/external_ui_integration_test.dart +++ b/dev/devicelab/bin/tasks/external_ui_integration_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart b/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart index 3305af0df6c..3174d152a6e 100644 --- a/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart +++ b/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart index 6997c4abd69..14ea384c1d0 100644 --- a/dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart b/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart index c5ad38108d1..3d7d393339d 100644 --- a/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart +++ b/dev/devicelab/bin/tasks/fast_scroll_heavy_gridview__memory.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart b/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart index 69c24a257ce..e61adf6c7e2 100644 --- a/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart +++ b/dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flavors_test.dart b/dev/devicelab/bin/tasks/flavors_test.dart index 8e3881ecfe2..92e1522b6e3 100644 --- a/dev/devicelab/bin/tasks/flavors_test.dart +++ b/dev/devicelab/bin/tasks/flavors_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flavors_test_ios.dart b/dev/devicelab/bin/tasks/flavors_test_ios.dart index e7401496895..c20de247a2a 100644 --- a/dev/devicelab/bin/tasks/flavors_test_ios.dart +++ b/dev/devicelab/bin/tasks/flavors_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flavors_test_win.dart b/dev/devicelab/bin/tasks/flavors_test_win.dart index 8e3881ecfe2..92e1522b6e3 100644 --- a/dev/devicelab/bin/tasks/flavors_test_win.dart +++ b/dev/devicelab/bin/tasks/flavors_test_win.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_attach_test_fuchsia.dart b/dev/devicelab/bin/tasks/flutter_attach_test_fuchsia.dart index 919fcdfc14c..6d388e78005 100644 --- a/dev/devicelab/bin/tasks/flutter_attach_test_fuchsia.dart +++ b/dev/devicelab/bin/tasks/flutter_attach_test_fuchsia.dart @@ -10,7 +10,7 @@ import 'dart:io'; import 'dart:math'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_engine_group_performance.dart b/dev/devicelab/bin/tasks/flutter_engine_group_performance.dart index 10a17305c9e..b88eb04e523 100644 --- a/dev/devicelab/bin/tasks/flutter_engine_group_performance.dart +++ b/dev/devicelab/bin/tasks/flutter_engine_group_performance.dart @@ -7,7 +7,7 @@ import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart' as utils; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__back_button_memory.dart b/dev/devicelab/bin/tasks/flutter_gallery__back_button_memory.dart index 35b713eb5ed..83401c256d8 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__back_button_memory.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__back_button_memory.dart @@ -7,7 +7,7 @@ /// Measure application memory usage after pausing and resuming the app /// with the Android back button. -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__start_up.dart b/dev/devicelab/bin/tasks/flutter_gallery__start_up.dart index 603b1708ed2..2bdec9435d4 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__start_up.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf.dart index 58d5e01eb71..94f2ced349f 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e.dart index dec0c797e1a..7f8bd7db648 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart index 18b0c6b33d4..88d6b3f2ffa 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios32.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios32.dart index 18b0c6b33d4..88d6b3f2ffa 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios32.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios32.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_hybrid.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_hybrid.dart index d406d0e8f13..8cdbfd4043a 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_hybrid.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_hybrid.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_with_semantics.dart b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_with_semantics.dart index f67a355d714..434d0c7b370 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_with_semantics.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery__transition_perf_with_semantics.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_android__compile.dart b/dev/devicelab/bin/tasks/flutter_gallery_android__compile.dart index 2c754929261..3d43575dfab 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_android__compile.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_android__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart b/dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart index 43ec4b11dad..19885bac24e 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_instrumentation_test.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart b/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart index 57285c38154..9e6220b9715 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_ios__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart b/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart index e222e742e4c..bbf70ea26a6 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_ios__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_ios__transition_perf.dart b/dev/devicelab/bin/tasks/flutter_gallery_ios__transition_perf.dart index 5736ea28cfe..25f990e9311 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_ios__transition_perf.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_ios__transition_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/gallery.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf.dart b/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf.dart index f20e2b856d1..eb1f3279a81 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf_e2e.dart b/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf_e2e.dart index ac429a87e8b..5eb6cc94a37 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf_e2e.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_sksl_warmup__transition_perf_e2e.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_gallery_win__compile.dart b/dev/devicelab/bin/tasks/flutter_gallery_win__compile.dart index 2c754929261..3d43575dfab 100644 --- a/dev/devicelab/bin/tasks/flutter_gallery_win__compile.dart +++ b/dev/devicelab/bin/tasks/flutter_gallery_win__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_run_test.dart b/dev/devicelab/bin/tasks/flutter_run_test.dart index 79e8cb41d38..9a5cdbf39d6 100644 --- a/dev/devicelab/bin/tasks/flutter_run_test.dart +++ b/dev/devicelab/bin/tasks/flutter_run_test.dart @@ -9,7 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_view__start_up.dart b/dev/devicelab/bin/tasks/flutter_view__start_up.dart index b57ce985d49..ca9345e1bff 100644 --- a/dev/devicelab/bin/tasks/flutter_view__start_up.dart +++ b/dev/devicelab/bin/tasks/flutter_view__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart b/dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart index bd3727ed3af..c6e1350ac37 100644 --- a/dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/flutter_view_ios__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/frame_policy_delay_test_android.dart b/dev/devicelab/bin/tasks/frame_policy_delay_test_android.dart index f39e122599b..835792e31ce 100644 --- a/dev/devicelab/bin/tasks/frame_policy_delay_test_android.dart +++ b/dev/devicelab/bin/tasks/frame_policy_delay_test_android.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fullscreen_textfield_perf.dart b/dev/devicelab/bin/tasks/fullscreen_textfield_perf.dart index eef99119490..a58be1cd9bd 100644 --- a/dev/devicelab/bin/tasks/fullscreen_textfield_perf.dart +++ b/dev/devicelab/bin/tasks/fullscreen_textfield_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fullscreen_textfield_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/fullscreen_textfield_perf__e2e_summary.dart index 2deca4395df..7bb7ab7cea1 100644 --- a/dev/devicelab/bin/tasks/fullscreen_textfield_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/fullscreen_textfield_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/fullscreen_textfield_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/fullscreen_textfield_perf__timeline_summary.dart index eef99119490..a58be1cd9bd 100644 --- a/dev/devicelab/bin/tasks/fullscreen_textfield_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/fullscreen_textfield_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/hello_world_android__compile.dart b/dev/devicelab/bin/tasks/hello_world_android__compile.dart index db139dab1cb..279cf62b0a4 100644 --- a/dev/devicelab/bin/tasks/hello_world_android__compile.dart +++ b/dev/devicelab/bin/tasks/hello_world_android__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/hello_world_ios__compile.dart b/dev/devicelab/bin/tasks/hello_world_ios__compile.dart index 70281b0bf1e..8e57f2c651c 100644 --- a/dev/devicelab/bin/tasks/hello_world_ios__compile.dart +++ b/dev/devicelab/bin/tasks/hello_world_ios__compile.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/home_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/home_scroll_perf__timeline_summary.dart index ce02f9e99bd..72f80a81c44 100644 --- a/dev/devicelab/bin/tasks/home_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/home_scroll_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart b/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart index e8d23156567..0bf1d174018 100644 --- a/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart +++ b/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf__timeline_summary.dart index e8f9cdeb7bf..0b8e3a1632f 100644 --- a/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_test_test.dart b/dev/devicelab/bin/tasks/integration_test_test.dart index 1829b0db36b..d4a0ea8830b 100644 --- a/dev/devicelab/bin/tasks/integration_test_test.dart +++ b/dev/devicelab/bin/tasks/integration_test_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_test_test_ios.dart b/dev/devicelab/bin/tasks/integration_test_test_ios.dart index 2ad15b9b2b1..c68feab69e3 100644 --- a/dev/devicelab/bin/tasks/integration_test_test_ios.dart +++ b/dev/devicelab/bin/tasks/integration_test_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_driver.dart b/dev/devicelab/bin/tasks/integration_ui_driver.dart index 3a195b3803d..f677fa43de0 100644 --- a/dev/devicelab/bin/tasks/integration_ui_driver.dart +++ b/dev/devicelab/bin/tasks/integration_ui_driver.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart b/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart index 6d0fc3a52e8..ebe41478f20 100644 --- a/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart +++ b/dev/devicelab/bin/tasks/integration_ui_ios_driver.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart b/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart index 1bdaee640a7..1945e8f09c7 100644 --- a/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart +++ b/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart b/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart index 1f517a04ed1..7d208c9d363 100644 --- a/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart +++ b/dev/devicelab/bin/tasks/integration_ui_ios_screenshot.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart b/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart index efa98b4dff9..cd92e0db1d4 100644 --- a/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart +++ b/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart b/dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart index bb3efa91c19..360ded7e08a 100644 --- a/dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart +++ b/dev/devicelab/bin/tasks/integration_ui_keyboard_resize.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_screenshot.dart b/dev/devicelab/bin/tasks/integration_ui_screenshot.dart index e8d18ca223a..3717fd9d5d1 100644 --- a/dev/devicelab/bin/tasks/integration_ui_screenshot.dart +++ b/dev/devicelab/bin/tasks/integration_ui_screenshot.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/integration_ui_textfield.dart b/dev/devicelab/bin/tasks/integration_ui_textfield.dart index 96e72fbe167..616674c700d 100644 --- a/dev/devicelab/bin/tasks/integration_ui_textfield.dart +++ b/dev/devicelab/bin/tasks/integration_ui_textfield.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/ios_defines_test.dart b/dev/devicelab/bin/tasks/ios_defines_test.dart index 63cd4dab33b..12a5c112ca5 100644 --- a/dev/devicelab/bin/tasks/ios_defines_test.dart +++ b/dev/devicelab/bin/tasks/ios_defines_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/ios_platform_view_tests.dart b/dev/devicelab/bin/tasks/ios_platform_view_tests.dart index c470eea4cff..d08087e59a1 100644 --- a/dev/devicelab/bin/tasks/ios_platform_view_tests.dart +++ b/dev/devicelab/bin/tasks/ios_platform_view_tests.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart b/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart index 9b3e08cccd6..8e0f268ba84 100644 --- a/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart +++ b/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart b/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart index a319613475e..241986bcf34 100644 --- a/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart +++ b/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/microbenchmarks.dart b/dev/devicelab/bin/tasks/microbenchmarks.dart index 569db64998b..39bc0c9221e 100644 --- a/dev/devicelab/bin/tasks/microbenchmarks.dart +++ b/dev/devicelab/bin/tasks/microbenchmarks.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/microbenchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/microbenchmarks_ios.dart b/dev/devicelab/bin/tasks/microbenchmarks_ios.dart index d9a5b88a64b..a85fdfbee71 100644 --- a/dev/devicelab/bin/tasks/microbenchmarks_ios.dart +++ b/dev/devicelab/bin/tasks/microbenchmarks_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/microbenchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart index 656366c63ae..e4995e91ece 100644 --- a/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart b/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart index c0b070eaa7b..abfb566a0af 100644 --- a/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart +++ b/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/host_agent.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart b/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart index a98c7f08f90..681a1f5e3c1 100644 --- a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/new_gallery.dart'; diff --git a/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart index d9b2d3e451d..0c403094a91 100644 --- a/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/new_gallery.dart'; diff --git a/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart index 0845609c046..3f7c286d5c8 100644 --- a/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/new_gallery.dart'; diff --git a/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart index 70ac6568360..baaa4683e5d 100644 --- a/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart index d70b6a369c7..ac6d4d8adab 100644 --- a/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test.dart index 1e1477c2158..78be52a01f2 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart index 7a281faa03e..94aa03df79e 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart index 46453fa1941..73399400462 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart b/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart index cb272a5b3e6..10b1112943e 100644 --- a/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart +++ b/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart' +import 'package:flutter_devicelab/framework/devices.dart' show DeviceOperatingSystem; import 'package:flutter_devicelab/framework/framework.dart' show task; import 'package:flutter_devicelab/tasks/platform_channels_benchmarks.dart' diff --git a/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart b/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart index 5acc15bdd31..9087d0ebf72 100644 --- a/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart +++ b/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart' +import 'package:flutter_devicelab/framework/devices.dart' show DeviceOperatingSystem; import 'package:flutter_devicelab/framework/framework.dart' show task; import 'package:flutter_devicelab/tasks/platform_channels_benchmarks.dart' diff --git a/dev/devicelab/bin/tasks/platform_interaction_test.dart b/dev/devicelab/bin/tasks/platform_interaction_test.dart index fb977e3a868..6a2d3e7b97f 100644 --- a/dev/devicelab/bin/tasks/platform_interaction_test.dart +++ b/dev/devicelab/bin/tasks/platform_interaction_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart b/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart index 07defdb2134..057b49519fa 100644 --- a/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart +++ b/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_view__start_up.dart b/dev/devicelab/bin/tasks/platform_view__start_up.dart index fd4433e1129..dbf6f758f19 100644 --- a/dev/devicelab/bin/tasks/platform_view__start_up.dart +++ b/dev/devicelab/bin/tasks/platform_view__start_up.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart index 21ea3e487aa..e48fe7b7380 100644 --- a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @@ -6,7 +6,7 @@ import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart index f212d884280..81cc591c00b 100644 --- a/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart index c1efd58cca0..dfd05b5e05b 100644 --- a/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart index f6202f46e99..aa9245e7258 100644 --- a/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart index f7355ecd829..d417e496d08 100644 --- a/dev/devicelab/bin/tasks/routing_test.dart +++ b/dev/devicelab/bin/tasks/routing_test.dart @@ -9,7 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/host_agent.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/run_release_test.dart b/dev/devicelab/bin/tasks/run_release_test.dart index 3b72c8e2be7..412a280782c 100644 --- a/dev/devicelab/bin/tasks/run_release_test.dart +++ b/dev/devicelab/bin/tasks/run_release_test.dart @@ -9,7 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/service_extensions_test.dart b/dev/devicelab/bin/tasks/service_extensions_test.dart index d0359326e46..e45b0016e75 100644 --- a/dev/devicelab/bin/tasks/service_extensions_test.dart +++ b/dev/devicelab/bin/tasks/service_extensions_test.dart @@ -9,7 +9,7 @@ import 'dart:convert'; import 'dart:io'; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart b/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart index 1a9fb3e6fb1..8f49a8efc3c 100644 --- a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart +++ b/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart index cb7f83adcbe..353f03385bb 100644 --- a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart +++ b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/hot_mode_tests.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_build_test.dart b/dev/devicelab/bin/tasks/smoke_test_build_test.dart index 6bd57daa4c7..5051a8b6e06 100644 --- a/dev/devicelab/bin/tasks/smoke_test_build_test.dart +++ b/dev/devicelab/bin/tasks/smoke_test_build_test.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/tasks/build_test_task.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_device.dart b/dev/devicelab/bin/tasks/smoke_test_device.dart index c20ad8c6c36..044c62fd071 100644 --- a/dev/devicelab/bin/tasks/smoke_test_device.dart +++ b/dev/devicelab/bin/tasks/smoke_test_device.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/textfield_perf.dart b/dev/devicelab/bin/tasks/textfield_perf.dart index d7356a785e1..3d5d9455916 100644 --- a/dev/devicelab/bin/tasks/textfield_perf.dart +++ b/dev/devicelab/bin/tasks/textfield_perf.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart index ae4a11096eb..b2510ffea19 100644 --- a/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart @@ -6,7 +6,7 @@ import 'dart:async'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart index d7356a785e1..3d5d9455916 100644 --- a/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart index 09517195a17..414f4cb0e5a 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart index e5fba4e76d8..aa434df792e 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart index e5fba4e76d8..aa434df792e 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/lib/framework/adb.dart b/dev/devicelab/lib/framework/devices.dart similarity index 88% rename from dev/devicelab/lib/framework/adb.dart rename to dev/devicelab/lib/framework/devices.dart index c5d95dc8ce1..1d01b2e032f 100644 --- a/dev/devicelab/lib/framework/adb.dart +++ b/dev/devicelab/lib/framework/devices.dart @@ -152,6 +152,23 @@ abstract class Device { /// with some prefix. Stream get logcat; + /// Whether this device supports calls to [startLoggingToSink] + /// and [stopLoggingToSink]. + bool get canStreamLogs => false; + + /// Starts logging to an [IOSink]. + /// + /// If `clear` is set to true, the log will be cleared before starting. This + /// is not supported on all platforms. + Future startLoggingToSink(IOSink sink, {bool clear = true}) { + throw UnimplementedError(); + } + + /// Stops logging that was started by [startLoggingToSink]. + Future stopLoggingToSink() { + throw UnimplementedError(); + } + /// Stop a process. Future stop(String packageName); @@ -558,6 +575,52 @@ class AndroidDevice extends Device { }; } + @override + bool get canStreamLogs => true; + + bool _abortedLogging/*!*/ = false; + Process/*?*/ _loggingProcess; + + @override + Future startLoggingToSink(IOSink sink, {bool clear = true}) async { + if (clear) { + await adb(['logcat', '--clear'], silent: true); + } + _loggingProcess = await startProcess( + adbPath, + // Make logcat less chatty by filtering down to just ActivityManager + // (to let us know when app starts), flutter (needed by tests to see + // log output), and fatal messages (hopefully catches tombstones). + // For local testing, this can just be: + // ['-s', deviceId, 'logcat'] + // to view the whole log, or just run logcat alongside this. + ['-s', deviceId, 'logcat', 'ActivityManager:I', 'flutter:V', '*:F'], + ); + _loggingProcess.stdout + .transform(const Utf8Decoder(allowMalformed: true)) + .listen((String line) { + sink.write(line); + }); + _loggingProcess.stderr + .transform(const Utf8Decoder(allowMalformed: true)) + .listen((String line) { + sink.write(line); + }); + unawaited(_loggingProcess.exitCode.then((int exitCode) { + if (!_abortedLogging) { + sink.writeln('adb logcat failed with exit code $exitCode.\n'); + } + })); + } + + @override + Future stopLoggingToSink() async { + assert(_loggingProcess != null); + _abortedLogging = true; + _loggingProcess.kill(); + await _loggingProcess.exitCode; + } + @override Stream get logcat { final Completer stdoutDone = Completer(); @@ -760,11 +823,66 @@ class IosDeviceDiscovery implements DeviceDiscovery { /// iOS device. class IosDevice extends Device { - const IosDevice({ @required this.deviceId }); + IosDevice({ @required this.deviceId }); @override final String deviceId; + String get idevicesyslogPath { + return path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libimobiledevice', 'idevicesyslog'); + } + + String get dyldLibraryPath { + final List dylibsPaths = [ + path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libimobiledevice'), + path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'openssl'), + path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'usbmuxd'), + path.join(flutterDirectory.path, 'bin', 'cache', 'artifacts', 'libplist'), + ]; + return dylibsPaths.join(':'); + } + + @override + bool get canStreamLogs => true; + + bool _abortedLogging/*!*/ = false; + Process/*?*/ _loggingProcess; + + @override + Future startLoggingToSink(IOSink sink, {bool clear = true}) async { + // Clear is not supported. + _loggingProcess = await startProcess( + idevicesyslogPath, + ['-u', deviceId, '--quiet'], + environment: { + 'DYLD_LIBRARY_PATH': dyldLibraryPath, + }, + ); + _loggingProcess.stdout + .transform(const Utf8Decoder(allowMalformed: true)) + .listen((String line) { + sink.write(line); + }); + _loggingProcess.stderr + .transform(const Utf8Decoder(allowMalformed: true)) + .listen((String line) { + sink.write(line); + }); + unawaited(_loggingProcess.exitCode.then((int exitCode) { + if (!_abortedLogging) { + sink.writeln('idevicesyslog failed with exit code $exitCode.\n'); + } + })); + } + + @override + Future stopLoggingToSink() async { + assert(_loggingProcess != null); + _abortedLogging = true; + _loggingProcess.kill(); + await _loggingProcess.exitCode; + } + // The methods below are stubs for now. They will need to be expanded. // We currently do not have a way to lock/unlock iOS devices. So we assume the // devices are already unlocked. For now we'll just keep them at minimum diff --git a/dev/devicelab/lib/framework/framework.dart b/dev/devicelab/lib/framework/framework.dart index 9b6cdbed415..2056f48aed5 100644 --- a/dev/devicelab/lib/framework/framework.dart +++ b/dev/devicelab/lib/framework/framework.dart @@ -14,7 +14,8 @@ import 'package:logging/logging.dart'; import 'package:path/path.dart' as path; import 'package:stack_trace/stack_trace.dart'; -import 'adb.dart'; +import 'devices.dart'; +import 'host_agent.dart'; import 'running_processes.dart'; import 'task_result.dart'; import 'utils.dart'; @@ -81,6 +82,14 @@ class _TaskRunner { final TaskFunction task; + Future _getWorkingDeviceIfAvailable() async { + try { + return await devices.workingDevice; + } on DeviceException { + return null; + } + } + // TODO(ianh): workaround for https://github.com/dart-lang/sdk/issues/23797 RawReceivePort _keepAlivePort; Timer _startTaskTimeout; @@ -136,11 +145,27 @@ class _TaskRunner { print('Skipping enabling configs for macOS, Linux, Windows, and Web'); } - Future futureResult = _performTask(); - if (taskTimeout != null) - futureResult = futureResult.timeout(taskTimeout); + final Device/*?*/ device = await _getWorkingDeviceIfAvailable(); + /*late*/ TaskResult result; + IOSink/*?*/ sink; + try { + if (device != null && device.canStreamLogs && hostAgent.dumpDirectory != null) { + sink = File(path.join(hostAgent.dumpDirectory.path, '${device.deviceId}.log')).openWrite(); + await device.startLoggingToSink(sink); + } - TaskResult result = await futureResult; + Future futureResult = _performTask(); + if (taskTimeout != null) + futureResult = futureResult.timeout(taskTimeout); + + result = await futureResult; + } finally { + if (device != null && device.canStreamLogs) { + assert(sink != null); + await device.stopLoggingToSink(); + await sink.close(); + } + } if (runProcessCleanup) { section('Checking running Dart$exe processes after task...'); diff --git a/dev/devicelab/lib/framework/host_agent.dart b/dev/devicelab/lib/framework/host_agent.dart index ed6cba0dc51..cf78fd7fefa 100644 --- a/dev/devicelab/lib/framework/host_agent.dart +++ b/dev/devicelab/lib/framework/host_agent.dart @@ -22,14 +22,11 @@ class HostAgent { final FileSystem _fileSystem; /// Creates a directory to dump file artifacts. - Directory get dumpDirectory { + Directory/*?*/ get dumpDirectory { if (_dumpDirectory == null) { // Set in LUCI recipe. final String directoryPath = _platform.environment['FLUTTER_LOGS_DIR']; - if (directoryPath == null) { - _dumpDirectory = _fileSystem.systemTempDirectory.createTempSync('flutter_test_logs.'); - print('Created tmp dump directory ${_dumpDirectory.path}'); - } else { + if (directoryPath != null) { _dumpDirectory = _fileSystem.directory(directoryPath)..createSync(recursive: true); print('Found FLUTTER_LOGS_DIR dump directory ${_dumpDirectory.path}'); } @@ -37,7 +34,7 @@ class HostAgent { return _dumpDirectory; } - static Directory _dumpDirectory; + static Directory/*?*/ _dumpDirectory; @visibleForTesting void resetDumpDirectory() { diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart index 77b1e19b503..7a84e9fd925 100644 --- a/dev/devicelab/lib/framework/runner.dart +++ b/dev/devicelab/lib/framework/runner.dart @@ -12,8 +12,8 @@ import 'package:flutter_devicelab/common.dart'; import 'package:meta/meta.dart'; import 'package:vm_service/vm_service.dart'; -import 'adb.dart'; import 'cocoon.dart'; +import 'devices.dart'; import 'task_result.dart'; import 'utils.dart'; diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index 05e5d805086..3354142bd3e 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -10,7 +10,7 @@ import 'dart:io'; import 'dart:math' as math; import 'package:flutter_devicelab/common.dart'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:meta/meta.dart'; import 'package:path/path.dart' as path; import 'package:process/process.dart'; @@ -471,6 +471,18 @@ Future flutter(String command, { canFail: canFail, environment: environment); } +Future startFlutter(String command, { + List options = const [], + Map environment = const {}, +}) { + final List args = flutterCommandArgs(command, options); + return startProcess( + path.join(flutterDirectory.path, 'bin', 'flutter'), + args, + environment: environment, + ); +} + /// Runs a `flutter` command and returns the standard output as a string. Future evalFlutter(String command, { List options = const [], diff --git a/dev/devicelab/lib/microbenchmarks.dart b/dev/devicelab/lib/microbenchmarks.dart index 091f9589a32..4a0ebf21bac 100644 --- a/dev/devicelab/lib/microbenchmarks.dart +++ b/dev/devicelab/lib/microbenchmarks.dart @@ -8,19 +8,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:flutter_devicelab/framework/utils.dart'; -import 'package:path/path.dart' as path; - -/// Launches a new Flutter process. -Future startFlutter({ - List options = const [], - bool canFail = false, - Map environment, -}) { - final List args = flutterCommandArgs('run', options); - return startProcess(path.join(flutterDirectory.path, 'bin', 'flutter'), args, environment: environment); -} - /// Reades through the print commands from [process] waiting for the magic phase /// that contains microbenchmarks results as defined in /// `dev/benchmarks/microbenchmarks/lib/common.dart`. diff --git a/dev/devicelab/lib/tasks/build_test_task.dart b/dev/devicelab/lib/tasks/build_test_task.dart index b7b7ce6115e..45b08a11df9 100644 --- a/dev/devicelab/lib/tasks/build_test_task.dart +++ b/dev/devicelab/lib/tasks/build_test_task.dart @@ -9,7 +9,7 @@ import 'dart:io'; import 'package:args/args.dart'; import 'package:flutter_devicelab/common.dart'; -import '../framework/adb.dart'; +import '../framework/devices.dart'; import '../framework/task_result.dart'; import '../framework/utils.dart'; diff --git a/dev/devicelab/lib/tasks/gallery.dart b/dev/devicelab/lib/tasks/gallery.dart index ab1ed143315..5a64f07812b 100644 --- a/dev/devicelab/lib/tasks/gallery.dart +++ b/dev/devicelab/lib/tasks/gallery.dart @@ -8,7 +8,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:math' as math; -import '../framework/adb.dart'; +import '../framework/devices.dart'; import '../framework/framework.dart'; import '../framework/host_agent.dart'; import '../framework/task_result.dart'; diff --git a/dev/devicelab/lib/tasks/hot_mode_tests.dart b/dev/devicelab/lib/tasks/hot_mode_tests.dart index 4d20c9f16b4..1e6b4b8f9ee 100644 --- a/dev/devicelab/lib/tasks/hot_mode_tests.dart +++ b/dev/devicelab/lib/tasks/hot_mode_tests.dart @@ -10,7 +10,7 @@ import 'dart:io'; import 'package:path/path.dart' as path; -import '../framework/adb.dart'; +import '../framework/devices.dart'; import '../framework/framework.dart'; import '../framework/task_result.dart'; import '../framework/utils.dart'; diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index a3c1b027c0d..c917524d1ee 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -4,7 +4,7 @@ // @dart = 2.8 -import '../framework/adb.dart'; +import '../framework/devices.dart'; import '../framework/framework.dart'; import '../framework/host_agent.dart'; import '../framework/task_result.dart'; diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index cee873008de..91a6a0a54b9 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -7,7 +7,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; @@ -37,8 +37,8 @@ TaskFunction createMicrobenchmarkTask() { ]; options.add(benchmarkPath); return startFlutter( + 'run', options: options, - canFail: false, ); }); diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart index b8f839bb17b..eacdba32eef 100644 --- a/dev/devicelab/lib/tasks/perf_tests.dart +++ b/dev/devicelab/lib/tasks/perf_tests.dart @@ -9,7 +9,7 @@ import 'dart:convert' show LineSplitter, json, utf8; import 'dart:io'; import 'dart:math' as math; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/host_agent.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/lib/tasks/platform_channels_benchmarks.dart b/dev/devicelab/lib/tasks/platform_channels_benchmarks.dart index 4ad3097fbf2..361d0502a42 100644 --- a/dev/devicelab/lib/tasks/platform_channels_benchmarks.dart +++ b/dev/devicelab/lib/tasks/platform_channels_benchmarks.dart @@ -6,7 +6,7 @@ import 'dart:io' show Process, Directory; -import 'package:flutter_devicelab/framework/adb.dart' as adb; +import 'package:flutter_devicelab/framework/devices.dart' as adb; import 'package:flutter_devicelab/framework/framework.dart' show TaskFunction; import 'package:flutter_devicelab/framework/task_result.dart' show TaskResult; import 'package:flutter_devicelab/framework/utils.dart' as utils; @@ -43,9 +43,9 @@ TaskFunction runTask(adb.DeviceOperatingSystem operatingSystem) { '-d', device.deviceId, ]; - return microbenchmarks.startFlutter( + return utils.startFlutter( + 'run', options: options, - canFail: false, ); }); diff --git a/dev/devicelab/test/adb_test.dart b/dev/devicelab/test/adb_test.dart index 3700dea9480..018ce409efc 100644 --- a/dev/devicelab/test/adb_test.dart +++ b/dev/devicelab/test/adb_test.dart @@ -6,7 +6,7 @@ import 'package:collection/collection.dart' show ListEquality, MapEquality; -import 'package:flutter_devicelab/framework/adb.dart'; +import 'package:flutter_devicelab/framework/devices.dart'; import 'package:meta/meta.dart'; import 'common.dart'; diff --git a/dev/devicelab/test/host_agent_test.dart b/dev/devicelab/test/host_agent_test.dart index 78bec7648e9..50bad78bfc3 100644 --- a/dev/devicelab/test/host_agent_test.dart +++ b/dev/devicelab/test/host_agent_test.dart @@ -39,15 +39,7 @@ void main() { final FakePlatform fakePlatform = FakePlatform(environment: {}, operatingSystem: 'windows'); final HostAgent agent = HostAgent(platform: fakePlatform, fileSystem: fs); - expect(agent.dumpDirectory.existsSync(), isTrue); - }); - - test('is the same between host agent instances', () async { - final FakePlatform fakePlatform = FakePlatform(environment: {}, operatingSystem: 'windows'); - final HostAgent agent1 = HostAgent(platform: fakePlatform, fileSystem: fs); - final HostAgent agent2 = HostAgent(platform: fakePlatform, fileSystem: fs); - - expect(agent1.dumpDirectory.path, agent2.dumpDirectory.path); + expect(agent.dumpDirectory, null); }); }); }