Skip to content

Remove scenario_app/android and rename to ios_scenario_app. #160992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matanlurey merged 8 commits into from
Jan 28, 2025
Merged

Remove scenario_app/android and rename to ios_scenario_app. #160992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5bbedf2
Remove android, and rename to ios_scenario_app.
matanlurey Dec 30, 2024
f00c96b
Run et format.
matanlurey Dec 30, 2024
697da8e
ios_scenario_app has no Dart unit tests, so remove from run_tests.py.
matanlurey Dec 30, 2024
00ffc0f
Remove stale tests.
matanlurey Jan 3, 2025
36576c2
Restore missing file.
matanlurey Jan 3, 2025
fcfdb55
Revert some removals in .ci.yaml.
matanlurey Jan 6, 2025
82d1a71
Merge branch 'master' into remove-android-scenario-app
matanlurey Jan 27, 2025
a4fadd8
++
matanlurey Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions docs/platforms/android/Upgrading-Engine's-Android-API-version.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,9 @@ Modify the following files as described:
* `shell/platform/android/test_runner/build.gradle`: Bump `compileSdkVersion XX` to the latest version.
* `shell/platform/android/AndroidManifest.xml`: Bump `android:targetSdkVersion=XX` to the latest version.
* `testing/android/native_activity/native_activity.gni`: Bump the reference to `build-tools/XX` in `android_buildtools` to the latest **build-tools** version and the reference to `android-XX` in `android_jar` to the latest version.
* `testing/scenario_app/android/app/build.gradle`: Upgrade `buildToolsVersion` to the latest **build-tools** version and the `compileSdkVersion` and `targetSdkVersion` to the latest version.
* In all other android projects in `testing`: Upgrade the `compileSdkVersion` and `targetSdkVersion` in `android/app/build.gradle`.

This list may become outdated, so be sure to change any references to the old SDK version to the latest version in `build.gradle` files across the repo.

### Update our `android_virtual_device` dependency

1. Locate the desired Android Virtual Device (AVD) from https://chrome-infra-packages.appspot.com/p/chromium/tools/android/avd/linux-amd64/. You should look at the most recently updated AVD and verify that
it has the desired `generic_android<API#>.textpb` for the API version that you are modifying the engine to support. Then, determine its build_id number by clicking on the AVD instance you would like to use and looking for the build_id tag.
2. In each of the engine builders (at the time of writing: `ci/builders/standalone/linux_android_emulator_skia.json` & `ci/builders/standalone/linux_android_emulator.json`), find the `android_virtual_device` and `avd_cipd_version` dependency entries and update them to the versions you desire, e.g.

```json
{
"dependency": "android_virtual_device",
"version": "android_<API#>_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:<build_id>"
}
```

## Next Steps: Update the Framework, Examples and Samples

* Templates in [the framework](https://github.com/flutter/flutter): Change `targetSdkVersion` in various `build.gradle.tmpl` files to use the new API version
Expand Down
104 changes: 0 additions & 104 deletions engine/src/flutter/.ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,110 +56,6 @@ targets:
# local_engine schedules a bunch of other builds, so it's likely to timeout waiting for those builds to run.
timeout: 180

- name: Linux linux_android_emulator_tests
bringup: true
enabled_branches:
- master
recipe: engine_v2/engine_v2
properties:
config_name: linux_android_emulator
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- DEPS
- engine/src/flutter/.ci.yaml
- engine/src/flutter/ci/builders/linux_android_emulator.json
- engine/src/flutter/lib/ui/**
- engine/src/flutter/shell/platform/android/**
- engine/src/flutter/testing/scenario_app/**
- engine/src/flutter/testing/skia_gold_client/**

- name: Linux linux_android_emulator_tests_34
enabled_branches:
- master
recipe: engine_v2/engine_v2
properties:
config_name: linux_android_emulator_34
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- DEPS
- engine/src/flutter/.ci.yaml
- engine/src/flutter/ci/builders/linux_android_emulator.json
- engine/src/flutter/lib/ui/**
- engine/src/flutter/shell/platform/android/**
- engine/src/flutter/testing/scenario_app/**
- engine/src/flutter/testing/skia_gold_client/**

- name: Linux linux_android_emulator_opengles_tests_34
enabled_branches:
- master
recipe: engine_v2/engine_v2
properties:
config_name: linux_android_emulator_opengles_34
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- DEPS
- engine/src/flutter/.ci.yaml
- engine/src/flutter/ci/builders/linux_android_emulator_opengles_34.json
- engine/src/flutter/lib/ui/**
- engine/src/flutter/shell/platform/android/**
- engine/src/flutter/testing/scenario_app/**
- engine/src/flutter/testing/skia_gold_client/**

- name: Linux linux_android_emulator_skia_tests
bringup: true
enabled_branches:
- master
recipe: engine_v2/builder
properties:
config_name: linux_android_emulator_skia
kvm: "1"
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- DEPS
- engine/src/flutter/.ci.yaml
- engine/src/flutter/ci/builders/linux_android_emulator.json
- engine/src/flutter/lib/ui/**
- engine/src/flutter/shell/platform/android/**
- engine/src/flutter/testing/scenario_app/**
- engine/src/flutter/testing/skia_gold_client/**

- name: Linux linux_android_emulator_skia_tests_34
enabled_branches:
- master
recipe: engine_v2/builder
properties:
config_name: linux_android_emulator_skia_34
kvm: "1"
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
timeout: 90
runIf:
- DEPS
- engine/src/flutter/.ci.yaml
- engine/src/flutter/ci/builders/linux_android_emulator.json
- engine/src/flutter/lib/ui/**
- engine/src/flutter/shell/platform/android/**
- engine/src/flutter/testing/scenario_app/**
- engine/src/flutter/testing/skia_gold_client/**

- name: Linux builder_cache
enabled_branches:
- master
Expand Down
4 changes: 2 additions & 2 deletions engine/src/flutter/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ group("flutter") {
}

if ((flutter_runtime_mode == "debug" || flutter_runtime_mode == "profile") &&
(is_ios || is_android)) {
public_deps += [ "//flutter/testing/scenario_app" ]
is_ios) {
public_deps += [ "//flutter/testing/ios_scenario_app" ]
}
}

Expand Down
2 changes: 1 addition & 1 deletion engine/src/flutter/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,13 @@ $ ./run_tests.py --variant=host_debug_unopt_arm64 --type=engine
| impeller_dart_unittests | engine | |
| impeller_golden_tests | engine(mac) | Generates golden images for impeller (vulkan, metal, opengles). |
| impeller_unittests | engine | impeller unit tests and interactive tests |
| ios_scenario_app | android | Integration and golden tests for iOS. |
| ios_test_flutter | objc | dynamic library of objc tests to be run with XCTest |
| jni_unittests | engine(not windows) | |
| no_dart_plugin_registrant_unittests | engine | |
| platform_view_android_delegate_unittests | engine(not windows) | |
| runtime_unittests | engine | |
| shell_unittests | engine(not windows) | |
| scenario_app | android | Integration and golden tests for Android, iOS |
| tonic_unittests | engine | Unit tests for //third_party/tonic |
| txt_unittests | engine(linux) | |
| ui_unittests | engine | |
Expand Down
19 changes: 1 addition & 18 deletions engine/src/flutter/ci/builders/linux_android_aot_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,27 +196,10 @@
"targets": [
"clang_x64/gen_snapshot",
"default",
"flutter/testing/scenario_app/android",
"flutter/shell/platform/android:abi_jars",
"flutter/shell/platform/android:analyze_snapshot"
]
},
"tests": [
{
"env": {
"STORAGE_BUCKET": "gs://flutter_firebase_testlab_staging",
"GCP_PROJECT": "flutter-infra-staging"
},
"name": "test: Android Firebase Test",
"language": "python3",
"script": "flutter/ci/firebase_testlab.py",
"parameters": [
"--variant",
"ci/android_profile_arm64"
],
"test_if": "main"
}
]
}
},
{
"archives": [
Expand Down
33 changes: 3 additions & 30 deletions engine/src/flutter/ci/builders/linux_android_emulator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
}
],
"name": "ci/android_emulator_debug_x64",
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app tests.",
"description": "Build for debug mode x64 Android emulator tests.",
"ninja": {
"config": "ci/android_emulator_debug_x64",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
"flutter/shell/platform/android:flutter_shell_native_unittests"
]
},
"tests": [
Expand Down Expand Up @@ -65,31 +64,6 @@
"name": "skia_gold_client/e2e_test",
"script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
"max_attempts": 1
},
{
"language": "dart",
"name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
"test_timeout_secs": 900,
"max_attempts": 2,
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_35_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8733065022087935185"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
"parameters": [
"--out-dir=../out/ci/android_emulator_debug_x64",
"--enable-impeller",
"--impeller-backend=vulkan"
]
}
]
},
Expand Down Expand Up @@ -124,8 +98,7 @@
"config": "ci/android_emulator_debug_x86",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
"flutter/shell/platform/android:flutter_shell_native_unittests"
]
},
"tests": [
Expand Down
33 changes: 3 additions & 30 deletions engine/src/flutter/ci/builders/linux_android_emulator_34.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
}
],
"name": "ci/android_emulator_debug_x64",
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app tests.",
"description": "Build for debug mode x64 Android emulator tests.",
"ninja": {
"config": "ci/android_emulator_debug_x64",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
"flutter/shell/platform/android:flutter_shell_native_unittests"
]
},
"tests": [
Expand Down Expand Up @@ -65,31 +64,6 @@
"name": "skia_gold_client/e2e_test",
"script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
"max_attempts": 1
},
{
"language": "dart",
"name": "Android Scenario App Integration Tests (Impeller/Vulkan)",
"test_timeout_secs": 900,
"max_attempts": 2,
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8733065022087935185"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
"parameters": [
"--out-dir=../out/ci/android_emulator_debug_x64",
"--enable-impeller",
"--impeller-backend=vulkan"
]
}
]
},
Expand Down Expand Up @@ -124,8 +98,7 @@
"config": "ci/android_emulator_debug_x86",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
"flutter/shell/platform/android:flutter_shell_native_unittests"
]
},
"tests": [
Expand Down
30 changes: 2 additions & 28 deletions engine/src/flutter/ci/builders/linux_android_emulator_opengles_34.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
}
],
"name": "ci/android_emulator_debug_x64",
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app tests.",
"description": "Build for debug mode x64 Android emulator tests.",
"ninja": {
"config": "ci/android_emulator_debug_x64",
"targets": [
"flutter/impeller/toolkit/android:unittests",
"flutter/shell/platform/android:flutter_shell_native_unittests",
"flutter/testing/scenario_app"
"flutter/shell/platform/android:flutter_shell_native_unittests"
]
},
"tests": [
Expand Down Expand Up @@ -65,31 +64,6 @@
"name": "skia_gold_client/e2e_test",
"script": "flutter/testing/skia_gold_client/tool/e2e_test.dart",
"max_attempts": 1
},
{
"language": "dart",
"name": "Android Scenario App Integration Tests (Impeller/GLES)",
"test_timeout_secs": 900,
"max_attempts": 2,
"test_dependencies": [
{
"dependency": "android_virtual_device",
"version": "android_34_google_apis_x64.textpb"
},
{
"dependency": "avd_cipd_version",
"version": "build_id:8733065022087935185"
}
],
"contexts": [
"android_virtual_device"
],
"script": "flutter/testing/scenario_app/bin/run_android_tests.dart",
"parameters": [
"--out-dir=../out/ci/android_emulator_debug_x64",
"--enable-impeller",
"--impeller-backend=opengles"
]
}
]
}
Expand Down
Loading
Loading