Fix Android scenario_app to actually run and block on CI

.ci.yaml

@@ -54,6 +54,10 @@ targets:
     recipe: engine_v2/engine_v2
     properties:
       config_name: linux_android_emulator
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
     timeout: 60
     runIf:
       - .ci.yaml
@@ -71,6 +75,10 @@ targets:
     recipe: engine_v2/engine_v2
     properties:
       config_name: linux_android_emulator_api_33
+      dependencies: >-
+        [
+          {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
+        ]
     timeout: 60
     runIf:
       - .ci.yaml

ci/builders/linux_android_emulator.json

@@ -17,6 +17,12 @@
                 "--rbe",
                 "--no-goma"
             ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
             "name": "android_debug_x64",
             "ninja": {
                 "config": "android_debug_x64",

ci/builders/linux_android_emulator_api_33.json

@@ -17,6 +17,12 @@
                 "--rbe",
                 "--no-goma"
             ],
+            "dependencies": [
+                {
+                    "dependency": "goldctl",
+                    "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
+                }
+            ],
             "name": "android_debug_x64",
             "ninja": {
                 "config": "android_debug_x64",

testing/scenario_app/bin/android_integration_tests.dart

@@ -21,27 +21,41 @@ void main(List<String> args) async {
   final ArgParser parser = ArgParser()
     ..addOption(
       'adb',
-      help: 'absolute path to the adb tool',
+      help: 'Absolute path to the adb tool',
       mandatory: true,
     )
     ..addOption(
       'out-dir',
-      help: 'out directory',
+      help: 'Out directory',
       mandatory: true,
     )
-    ..addFlag(
+    ..addOption(
       'smoke-test',
       help: 'runs a single test to verify the setup',
-      negatable: false,
+      valueHelp: 'The class to execute, defaults to dev.flutter.scenarios.EngineLaunchE2ETest',
+    )
+    ..addFlag(
+      'use-skia-gold',
+      help: 'Use Skia Gold to compare screenshots.',
+      defaultsTo: isLuciEnv,
     );
 
   runZonedGuarded(
     () async {
       final ArgResults results = parser.parse(args);
       final Directory outDir = Directory(results['out-dir'] as String);
       final File adb = File(results['adb'] as String);
-      final bool smokeTest = results['smoke-test'] as bool;
-      await _run(outDir: outDir, adb: adb, smokeTest: smokeTest);
+      final bool useSkiaGold = results['use-skia-gold'] as bool;
+      String? smokeTest = results['smoke-test'] as String?;
+      if (results.wasParsed('smoke-test') && smokeTest!.isEmpty) {
+        smokeTest = 'dev.flutter.scenarios.EngineLaunchE2ETest';
+      }
+      await _run(
+        outDir: outDir,
+        adb: adb,
+        smokeTestFullPath: smokeTest,
+        useSkiaGold: useSkiaGold,
+      );
       exit(0);
     },
     (Object error, StackTrace stackTrace) {
@@ -57,7 +71,8 @@ void main(List<String> args) async {
 Future<void> _run({
   required Directory outDir,
   required File adb,
-  required bool smokeTest,
+  required String? smokeTestFullPath,
+  required bool useSkiaGold,
 }) async {
   const ProcessManager pm = LocalProcessManager();
 
@@ -178,7 +193,11 @@ Future<void> _run({
         await skiaGoldClient!.auth();
         log('skia gold client is available');
       } else {
-        log('skia gold client is unavailable');
+        if (useSkiaGold) {
+          panic(<String>['skia gold client is unavailable']);
+        } else {
+          log('skia gold client is unavaialble');
+        }
       }
     });
 
@@ -210,8 +229,8 @@ Future<void> _run({
         'am',
         'instrument',
         '-w',
-        if (smokeTest)
-          '-e class dev.flutter.scenarios.EngineLaunchE2ETest',
+        if (smokeTestFullPath != null)
+          '-e class $smokeTestFullPath',
         'dev.flutter.scenarios.test/dev.flutter.TestRunner',
       ]);
       if (exitCode != 0) {