diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index 9a4eac1bd12..b57cbd88ae4 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -89,7 +89,6 @@ targets: enabled_branches: - main recipe: engine_v2/engine_v2 - bringup: true properties: config_name: linux_android_emulator timeout: 60 diff --git a/engine/src/flutter/ci/builders/linux_android_emulator.json b/engine/src/flutter/ci/builders/linux_android_emulator.json index 735ee538747..847d161edbe 100644 --- a/engine/src/flutter/ci/builders/linux_android_emulator.json +++ b/engine/src/flutter/ci/builders/linux_android_emulator.json @@ -80,8 +80,7 @@ "ninja": { "config": "android_debug_x86", "targets": [ - "flutter/shell/platform/android:flutter_shell_native_unittests", - "flutter/testing/scenario_app" + "flutter/shell/platform/android:flutter_shell_native_unittests" ] }, "tests": [ diff --git a/engine/src/flutter/testing/android_systrace_test.py b/engine/src/flutter/testing/android_systrace_test.py index 1de674b5d29..fffac6d7136 100755 --- a/engine/src/flutter/testing/android_systrace_test.py +++ b/engine/src/flutter/testing/android_systrace_test.py @@ -140,6 +140,17 @@ def main(): args = parser.parse_args() + android_api_level = subprocess.check_output([ + args.adb_path, 'shell', 'getprop', 'ro.build.version.sdk' + ], + text=True).strip() + if int(android_api_level) < 29: + print( + 'Android API %s detected. This script requires API 29 or above.' % + android_api_level + ) + return 0 + install_apk(args.apk_path, args.package_name, args.adb_path) start_perfetto(args.package_name, args.adb_path) launch_package(args.package_name, args.activity_name, args.adb_path)