Update avd_test API versions

This commit is contained in:
topjohnwu 2024-12-02 15:13:29 -08:00
parent 06616659b8
commit 837c679a31
2 changed files with 18 additions and 8 deletions

View File

@ -83,10 +83,10 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34] version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
type: [""] type: [""]
include: include:
- version: 35 - version: "Baklava"
type: "google_apis" type: "google_apis"
steps: steps:

View File

@ -8,7 +8,7 @@ lsposed_url='https://github.com/LSPosed/LSPosed/releases/download/v1.9.2/LSPosed
emu_pid= emu_pid=
atd_min_api=30 atd_min_api=30
atd_max_api=34 atd_max_api=35
lsposed_min_api=27 lsposed_min_api=27
lsposed_max_api=34 lsposed_max_api=34
huge_ram_min_api=26 huge_ram_min_api=26
@ -25,6 +25,7 @@ cleanup() {
} }
wait_for_bootanim() { wait_for_bootanim() {
set -e
adb wait-for-device adb wait-for-device
while true; do while true; do
local result="$(adb exec-out getprop init.svc.bootanim)" local result="$(adb exec-out getprop init.svc.bootanim)"
@ -38,6 +39,7 @@ wait_for_bootanim() {
} }
wait_for_boot() { wait_for_boot() {
set -e
adb wait-for-device adb wait-for-device
while true; do while true; do
local result="$(adb exec-out getprop sys.boot_completed)" local result="$(adb exec-out getprop sys.boot_completed)"
@ -79,8 +81,15 @@ test_emu() {
test_setup $variant test_setup $variant
# Install LSPosed local lsposed
if [ $api -ge $lsposed_min_api -a $api -le $lsposed_max_api ]; then if [ $api -ge $lsposed_min_api -a $api -le $lsposed_max_api ]; then
lsposed=true
else
lsposed=false
fi
# Install LSPosed
if $lsposed; then
adb push out/lsposed.zip /data/local/tmp/lsposed.zip adb push out/lsposed.zip /data/local/tmp/lsposed.zip
echo 'PATH=$PATH:/debug_ramdisk magisk --install-module /data/local/tmp/lsposed.zip' | adb shell /system/xbin/su echo 'PATH=$PATH:/debug_ramdisk magisk --install-module /data/local/tmp/lsposed.zip' | adb shell /system/xbin/su
fi fi
@ -91,7 +100,7 @@ test_emu() {
test_app test_app
# Try to launch LSPosed # Try to launch LSPosed
if [ $api -ge $lsposed_min_api -a $api -le $atd_max_api ]; then if $lsposed; then
adb shell rm -f /data/local/tmp/window_dump.xml adb shell rm -f /data/local/tmp/window_dump.xml
adb shell am start -c org.lsposed.manager.LAUNCH_MANAGER com.android.shell/.BugreportWarningActivity adb shell am start -c org.lsposed.manager.LAUNCH_MANAGER com.android.shell/.BugreportWarningActivity
while adb shell '[ ! -f /data/local/tmp/window_dump.xml ]'; do while adb shell '[ ! -f /data/local/tmp/window_dump.xml ]'; do
@ -113,6 +122,7 @@ run_test() {
TiramisuPrivacySandbox) api=33 ;; TiramisuPrivacySandbox) api=33 ;;
UpsideDownCakePrivacySandbox) api=34 ;; UpsideDownCakePrivacySandbox) api=34 ;;
VanillaIceCream) api=35 ;; VanillaIceCream) api=35 ;;
Baklava) api=36 ;;
*) *)
print_error "! Unknown system image version '$ver'" print_error "! Unknown system image version '$ver'"
exit 1 exit 1
@ -211,11 +221,11 @@ curl -L $lsposed_url -o out/lsposed.zip
if [ -n "$1" ]; then if [ -n "$1" ]; then
run_test $1 $2 run_test $1 $2
else else
for api in $(seq 23 34); do for api in $(seq 23 35); do
run_test $api run_test $api
done done
# Android 15 Beta # Android 16 Beta
run_test 35 google_apis run_test Baklava google_apis
# Run 16k page tests # Run 16k page tests
run_test 35 google_apis_ps16k run_test 35 google_apis_ps16k
fi fi