[go: nahoru, domu]

Roll experimental AVD configs with gpu mode "swangle_indirect"

These AVDs are created from https://crrev.com/c/4673991 and
https://chromium-swarm.appspot.com/task?id=634b951e78319310

They will be ran by the following builders:
* chromium/ci/android-12l-x64-fyi-dbg
* chromium/ci/android-13-x64-fyi-rel

Bug: 1431581
Change-Id: I63562e9d3a65e7835062de67fd149b17cf204a10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4673265
Reviewed-by: James Shen <zhiyuans@google.com>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1167815}
diff --git a/tools/android/avd/proto/generic_android32_foldable_experimental.textpb b/tools/android/avd/proto/generic_android32_foldable_experimental.textpb
index 796193b2..4205d8b 100644
--- a/tools/android/avd/proto/generic_android32_foldable_experimental.textpb
+++ b/tools/android/avd/proto/generic_android32_foldable_experimental.textpb
@@ -6,20 +6,24 @@
 
 emulator_package {
   package_name: "experimental/hypan_at_google.com/chromium/third_party/android_sdk/public/emulator"
-  version: "unizoio_BPhQXxevcOgK47Nqg1ZpaViURktsleZ2VfkC"  # 32.1.12 with updated swiftshader
+  version: "jQhbP9DXV2WHngpoEK7niJDbzIz_nEhX0B_Zpv-ee9kC"  # 33.1.10
   dest_path: "generic_android32_foldable_experimental"
 }
 
 system_image_package {
   package_name: "chromium/third_party/android_sdk/public/system-images/android-32/google_apis/x86_64"
-  version: "WhbaU7Z2Is60EoZ3jB-5QHnlFy-mXeUekoUgrLa_BqcC"  # r5, SE1B.220616.004
+  version: "KK_VeEUvdJrxL7eEKvVnt_4bjZPRLsGPymVm6Ios5HEC"  # r7
   dest_path: "generic_android32_foldable_experimental"
 }
 system_image_name: "system-images;android-32;google_apis;x86_64"
 
 avd_package {
-  package_name: "chromium/third_party/android_sdk/public/avds/android-32/google_apis/x86_64"
-  version: "Xw-9YOMCifPCpA-GtAK2PCxPs9BWsTmAkyBZny8DaooC"
+  package_name: "experimental/hypan_at_google.com/chromium/third_party/android_sdk/public/avds/android-32/google_apis/x86_64"
+  version: "Dr-SLZqcO8GK9Q2UYJwoVKhfuKBpecyvs5NyPi_NOaIC"
   dest_path: "generic_android32_foldable_experimental"
 }
 avd_name: "android_32_foldable_google_apis_x86_64"
+
+avd_launch_settings {
+  gpu_mode: "swangle_indirect"
+}
diff --git a/tools/android/avd/proto/generic_android33_experimental.textpb b/tools/android/avd/proto/generic_android33_experimental.textpb
index 9dd70f5..97331ff39 100644
--- a/tools/android/avd/proto/generic_android33_experimental.textpb
+++ b/tools/android/avd/proto/generic_android33_experimental.textpb
@@ -6,20 +6,24 @@
 
 emulator_package {
   package_name: "experimental/hypan_at_google.com/chromium/third_party/android_sdk/public/emulator"
-  version: "unizoio_BPhQXxevcOgK47Nqg1ZpaViURktsleZ2VfkC"  # 32.1.12 with updated swiftshader
+  version: "jQhbP9DXV2WHngpoEK7niJDbzIz_nEhX0B_Zpv-ee9kC"  # 33.1.10
   dest_path: "generic_android33_experimental"
 }
 
 system_image_package {
   package_name: "chromium/third_party/android_sdk/public/system-images/android-33/google_apis/x86_64"
-  version: "1TealwPsZ5QUC9ZhKI9-nbMjZ1cFouZQ-CzOv0varQcC"  # r9, TE1A.220922.021
+  version: "HUgG0VqVVYaAqFHIWkMJlTlMTbbT1TlIjxF4Tgd2AcgC"  # r12
   dest_path: "generic_android33_experimental"
 }
 system_image_name: "system-images;android-33;google_apis;x86_64"
 
 avd_package {
-  package_name: "chromium/third_party/android_sdk/public/avds/android-33/google_apis/x86_64"
-  version: "ArHSre6lDRPRC_WDP8x-NbgbAHM_ig0uTg54ireSpJoC"
+  package_name: "experimental/hypan_at_google.com/chromium/third_party/android_sdk/public/avds/android-33/google_apis/x86_64"
+  version: "IdqVHVP53KsFvcMkww5Mlg9AWmU7CHVTVNRXEGmub3YC"
   dest_path: "generic_android33_experimental"
 }
 avd_name: "android_33_google_apis_x86_64"
+
+avd_launch_settings {
+  gpu_mode: "swangle_indirect"
+}