This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[Android] Update integration test AVD dependency to use Android 35 emulators #54186
Merged
Merged
Changes from all commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
03266f1
Make base engine changes
camsim99 10e169b
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 7ca603d
Correct 35 version
camsim99 8c0e538
compileSdk
camsim99 291cb41
Undo packages + change for test
camsim99 65d90a9
format
camsim99 e317ce4
Change back to 35
camsim99 5ce0a8d
format
camsim99 9b01ee7
Test with buildroot changes
camsim99 3e09995
Update 35 version to 35v1
camsim99 7ff2d27
Update impeller test
camsim99 b530500
Correct Imepller version
camsim99 35265f8
Test correct root
camsim99 380766e
Another impeller update
camsim99 a9b171c
Correct build tools version
camsim99 d5963e2
Bump target version
camsim99 ea34633
Bump test runner AGP version
camsim99 380d49d
bump manifest target
camsim99 5961681
deps
camsim99 32339a9
Suppress deprecations
camsim99 1f07cd8
Undo added code
camsim99 1aec7b3
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 a8e44ac
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 d3b8f43
Update AGP, update packages.txt, remove unneeded test case
camsim99 645d8d2
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 77bf104
what is src dir
camsim99 53ee46d
Correct directory
camsim99 ca1611b
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 8edba5f
Merge branch 'main' into eng_35
camsim99 7fecb2a
Update buildroot commit
camsim99 ff12cf4
Merge remote-tracking branch 'refs/remotes/origin/eng_35' into eng_35
camsim99 7d37adc
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 7adc7b8
Temporarily undo deps change
camsim99 1635d85
Update DEPS entry
camsim99 5e58cf9
Update android_virtual_device dep
camsim99 09b92f5
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 6e53eff
Removed irrelevant comment, try --no-stripped
camsim99 595fc22
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 cc7063f
remove no-stripped
camsim99 140ca2a
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 44d2bcf
Run test workaround
camsim99 99e01cc
Undo screenshotutil changes
camsim99 9bcb2e5
Merge remote-tracking branch 'upstream/main' into eng_35
camsim99 4fe82e6
Merge branch 'main' into eng_35
camsim99 491fe12
Update avd package
camsim99 f488e97
Merge remote-tracking branch 'refs/remotes/origin/eng_35' into eng_35
camsim99 f292c02
Add 34 targets
camsim99 695d915
Mark 35 tests flaky
camsim99 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,9 +45,6 @@ platform_properties: | |
device_type: none | ||
os: Windows-10 | ||
|
||
# The current android emulator config names can be found here: | ||
# https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto | ||
# You may use those names for the android_virtual_device version. | ||
targets: | ||
- name: Linux local_engine_builds | ||
enabled_branches: | ||
|
@@ -57,6 +54,7 @@ targets: | |
config_name: local_engine | ||
|
||
- name: Linux linux_android_emulator_tests | ||
bringup: true | ||
enabled_branches: | ||
- main | ||
recipe: engine_v2/engine_v2 | ||
|
@@ -76,7 +74,29 @@ targets: | |
- testing/scenario_app/** | ||
- testing/skia_gold_client/** | ||
|
||
- name: Linux linux_android_emulator_tests_34 | ||
bringup: true | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be on the safe side, I'd suggest also shifting the the tests that will now be running on the 35 image to bringup as well. Otherwise, lgtm. |
||
enabled_branches: | ||
- main | ||
recipe: engine_v2/engine_v2 | ||
properties: | ||
config_name: linux_android_emulator_34 | ||
dependencies: >- | ||
[ | ||
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} | ||
] | ||
timeout: 90 | ||
runIf: | ||
- .ci.yaml | ||
- ci/builders/linux_android_emulator.json | ||
- DEPS | ||
- lib/ui/** | ||
- shell/platform/android/** | ||
- testing/scenario_app/** | ||
- testing/skia_gold_client/** | ||
|
||
- name: Linux linux_android_emulator_skia_tests | ||
bringup: true | ||
enabled_branches: | ||
- main | ||
recipe: engine_v2/engine_v2 | ||
|
@@ -96,6 +116,27 @@ targets: | |
- testing/scenario_app/** | ||
- testing/skia_gold_client/** | ||
|
||
- name: Linux linux_android_emulator_skia_tests_34 | ||
bringup: true | ||
enabled_branches: | ||
- main | ||
recipe: engine_v2/engine_v2 | ||
properties: | ||
config_name: linux_android_emulator_skia_34 | ||
dependencies: >- | ||
[ | ||
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} | ||
] | ||
timeout: 90 | ||
runIf: | ||
- .ci.yaml | ||
- ci/builders/linux_android_emulator.json | ||
- DEPS | ||
- lib/ui/** | ||
- shell/platform/android/** | ||
- testing/scenario_app/** | ||
- testing/skia_gold_client/** | ||
|
||
- name: Linux builder_cache | ||
enabled_branches: | ||
- main | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
{ | ||
"builds": [ | ||
{ | ||
"drone_dimensions": [ | ||
"device_type=none", | ||
"os=Linux", | ||
"kvm=1", | ||
"cores=8" | ||
], | ||
"gclient_variables": { | ||
"use_rbe": true | ||
}, | ||
"gn": [ | ||
"--android", | ||
"--android-cpu=x64", | ||
"--no-lto", | ||
"--rbe", | ||
"--no-goma", | ||
"--target-dir", | ||
"ci/android_emulator_debug_x64" | ||
], | ||
"dependencies": [ | ||
{ | ||
"dependency": "goldctl", | ||
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd" | ||
} | ||
], | ||
"name": "ci/android_emulator_debug_x64", | ||
"description": "Build for debug mode x64 Android emulator tests, and Impeller scenario app 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" | ||
] | ||
}, | ||
"tests": [ | ||
{ | ||
"language": "python3", | ||
"name": "Android Unit Tests", | ||
"test_dependencies": [ | ||
{ | ||
"dependency": "android_virtual_device", | ||
"version": "android_34_google_apis_x64.textpb" | ||
}, | ||
{ | ||
"dependency": "avd_cipd_version", | ||
"version": "build_id:8740267484269553649" | ||
} | ||
], | ||
"contexts": [ | ||
"android_virtual_device" | ||
], | ||
"script": "flutter/testing/run_tests.py", | ||
"parameters": [ | ||
"--android-variant", | ||
"ci/android_emulator_debug_x64", | ||
"--type", | ||
"android" | ||
] | ||
}, | ||
{ | ||
"language": "dart", | ||
"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:8740267484269553649" | ||
} | ||
], | ||
"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" | ||
] | ||
} | ||
] | ||
}, | ||
{ | ||
"drone_dimensions": [ | ||
"device_type=none", | ||
"os=Linux", | ||
"kvm=1", | ||
"cores=8" | ||
], | ||
"gclient_variables": { | ||
"use_rbe": true | ||
}, | ||
"gn": [ | ||
"--android", | ||
"--android-cpu=x86", | ||
"--no-lto", | ||
"--rbe", | ||
"--no-goma", | ||
"--target-dir", | ||
"ci/android_emulator_debug_x86" | ||
], | ||
"dependencies": [ | ||
{ | ||
"dependency": "goldctl", | ||
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd" | ||
} | ||
], | ||
"name": "ci/android_emulator_debug_x86", | ||
"description": "Build for debug mode x86 Android emulator tests.", | ||
"ninja": { | ||
"config": "ci/android_emulator_debug_x86", | ||
"targets": [ | ||
"flutter/impeller/toolkit/android:unittests", | ||
"flutter/shell/platform/android:flutter_shell_native_unittests", | ||
"flutter/testing/scenario_app" | ||
] | ||
}, | ||
"tests": [ | ||
{ | ||
"language": "python3", | ||
"name": "Android Unit Tests (API 28)", | ||
"test_dependencies": [ | ||
{ | ||
"dependency": "android_virtual_device", | ||
"version": "android_28_google_apis_x86.textpb" | ||
}, | ||
{ | ||
"dependency": "avd_cipd_version", | ||
"version": "build_id:8740267484269553649" | ||
} | ||
], | ||
"contexts": [ | ||
"android_virtual_device" | ||
], | ||
"script": "flutter/testing/run_tests.py", | ||
"parameters": [ | ||
"--android-variant", | ||
"ci/android_emulator_debug_x86", | ||
"--type", | ||
"android" | ||
] | ||
} | ||
] | ||
} | ||
] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed this comment because
android_virtual_device
is not even referenced here and updated documentation about upgrading this dependency will land with flutter/flutter#151601.