diff --git a/engine/src/flutter/ci/builders/linux_android_debug_engine.json b/engine/src/flutter/ci/builders/linux_android_debug_engine.json index 46cf1bd06d8..aefc834c34b 100644 --- a/engine/src/flutter/ci/builders/linux_android_debug_engine.json +++ b/engine/src/flutter/ci/builders/linux_android_debug_engine.json @@ -3,11 +3,143 @@ { "archives": [ { - "name": "linux_profile_arm64", + "name": "android_jit_release_x86", "type": "gcs", - "base_path": "out/linux_profile_arm64/zip_archives/", + "base_path": "out/android_jit_release_x86/zip_archives/", "include_paths": [ - "out/linux_profile_arm64/zip_archives/linux-arm64-profile/linux-arm64-flutter-gtk.zip" + "out/android_jit_release_x86/zip_archives/android-x86-jit-release/artifacts.zip", + "out/android_jit_release_x86/zip_archives/flutter_download_io" + ] + } + ], + "drone_dimensions": [ + "device_type=none", + "os=Linux" + ], + "gn": [ + "--android", + "--android-cpu=x86", + "--runtime-mode=jit_release" + ], + "name": "android_jit_release_x86", + "ninja": { + "config": "android_jit_release_x86", + "targets": [ + "flutter", + "flutter/shell/platform/android:embedding_jars", + "flutter/shell/platform/android:abi_jars", + "flutter/shell/platform/android:robolectric_tests" + ] + }, + "tests": [ + { + "language": "python", + "name": "Host Tests for android_jit_release_x86", + "parameters": [ + "--variant", + "android_jit_release_x86", + "--type", + "java", + "--engine-capture-core-dump", + "--android-variant", + "android_jit_release_x86" + ], + "script": "flutter/testing/run_tests.py", + "type": "local" + } + ] + }, + { + "archives": [ + { + "name": "android_debug_unopt", + "type": "gcs", + "base_path": "out/android_release/zip_archives/", + "include_paths": [] + } + ], + "drone_dimensions": [ + "device_type=none", + "os=Linux" + ], + "gclient_custom_vars": { + "download_android_deps": false + }, + "gn": [ + "--android", + "--unoptimized", + "--runtime-mode=debug", + "--no-lto" + ], + "name": "android_debug_unopt", + "ninja": { + "config": "android_debug_unopt", + "targets": [] + }, + "tests": [] + }, + { + "archives": [ + { + "name": "android_debug", + "type": "gcs", + "base_path": "out/android_debug/zip_archives/", + "include_paths": [ + "out/android_debug/zip_archives/android-arm/symbols.zip", + "out/android_debug/zip_archives/flutter_download_io", + "out/android_debug/zip_archives/android-arm/sky_engine.zip", + "out/android_debug/zip_archives/android-javadoc.zip" + ] + } + ], + "drone_dimensions": [ + "device_type=none", + "os=Linux" + ], + "gn": [ + "--android", + "--android-cpu=arm", + "--no-lto" + ], + "name": "android_debug", + "ninja": { + "config": "android_debug", + "targets": [ + "flutter", + "flutter/sky/dist:zip", + "flutter/shell/platform/android:embedding_jars", + "flutter/shell/platform/android:abi_jars", + "flutter/shell/platform/android:robolectric_tests" + ] + }, + "tests": [ + { + "language": "python", + "name": "Host Tests for android_debug", + "parameters": [ + "--variant", + "android_debug", + "--type", + "java", + "--engine-capture-core-dump", + "--android-variant", + "android_debug" + ], + "script": "flutter/testing/run_tests.py", + "type": "local" + } + ] + }, + { + "archives": [ + { + "name": "android_debug_arm64", + "type": "gcs", + "base_path": "out/android_debug_arm64/zip_archives/", + "include_paths": [ + "out/android_debug_arm64/zip_archives/android-arm64/artifacts.zip", + "out/android_debug_arm64/zip_archives/android-arm64/symbols.zip", + "out/android_debug_arm64/zip_archives/flutter_download_io" ] } ], @@ -19,18 +151,16 @@ "download_android_deps": false }, "gn": [ - "--runtime-mode", - "profile", - "--no-lto", - "--target-os=linux", - "--linux-cpu=arm64", - "--prebuilt-dart-sdk" + "--android", + "--android-cpu=arm64", + "--no-lto" ], - "name": "linux_profile_arm64", + "name": "android_debug_arm64", "ninja": { - "config": "linux_profile_arm64", + "config": "android_debug_arm64", "targets": [ - "flutter/shell/platform/linux:flutter_gtk" + "flutter", + "flutter/shell/platform/android:abi_jars" ] }, "tests": [] @@ -38,14 +168,13 @@ { "archives": [ { - "name": "linux_debug_arm64", + "name": "android_debug_x86", "type": "gcs", - "base_path": "out/linux_debug_arm64/zip_archives/", + "base_path": "out/android_debug_x86/zip_archives/", "include_paths": [ - "out/linux_debug_arm64/zip_archives/linux-arm64/artifacts.zip", - "out/linux_debug_arm64/zip_archives/linux-arm64/font-subset.zip", - "out/linux_debug_arm64/zip_archives/linux-arm64-debug/linux-arm64-flutter-gtk.zip", - "out/linux_debug_arm64/zip_archives/dart-sdk-linux-arm64.zip" + "out/android_debug_x86/zip_archives/android-x86/artifacts.zip", + "out/android_debug_x86/zip_archives/android-x86/symbols.zip", + "out/android_debug_x86/zip_archives/flutter_download_io" ] } ], @@ -57,21 +186,16 @@ "download_android_deps": false }, "gn": [ - "--runtime-mode", - "debug", - "--full-dart-sdk", - "--target-os=linux", - "--linux-cpu=arm64", - "--prebuilt-dart-sdk" + "--android", + "--android-cpu=x86", + "--no-lto" ], - "name": "linux_debug_arm64", + "name": "android_debug_x86", "ninja": { - "config": "linux_debug_arm64", + "config": "android_debug_x86", "targets": [ - "flutter/build/archives:artifacts", - "flutter/build/archives:dart_sdk_archive", - "flutter/tools/font-subset", - "flutter/shell/platform/linux:flutter_gtk" + "flutter", + "flutter/shell/platform/android:abi_jars" ] }, "tests": [] @@ -79,11 +203,13 @@ { "archives": [ { - "name": "linux_release_arm64", + "name": "android_debug_x64", "type": "gcs", - "base_path": "out/linux_release_arm64/zip_archives/", + "base_path": "out/android_debug_x64/zip_archives/", "include_paths": [ - "out/linux_release_arm64/zip_archives/linux-arm64-release/linux-arm64-flutter-gtk.zip" + "out/android_debug_x64/zip_archives/android-x64/artifacts.zip", + "out/android_debug_x64/zip_archives/android-x64/symbols.zip", + "out/android_debug_x64/zip_archives/flutter_download_io" ] } ], @@ -95,17 +221,16 @@ "download_android_deps": false }, "gn": [ - "--runtime-mode", - "release", - "--target-os=linux", - "--linux-cpu=arm64", - "--prebuilt-dart-sdk" + "--android", + "--android-cpu=x64", + "--no-lto" ], - "name": "linux_release_arm64", + "name": "android_debug_x64", "ninja": { - "config": "linux_release_arm64", + "config": "android_debug_x64", "targets": [ - "flutter/shell/platform/linux:flutter_gtk" + "flutter", + "flutter/shell/platform/android:abi_jars" ] }, "tests": []