Remove all the playstore AVD configs.
We are not using playstore AVDs in our builder anymore so cleam them up.
Change-Id: Idc22ae51154abbc87cff9f233b197855756e9f71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4956212
Reviewed-by: James Shen <zhiyuans@google.com>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1212912}
diff --git a/docs/android_emulator.md b/docs/android_emulator.md
index 3f442729..858cbea 100644
--- a/docs/android_emulator.md
+++ b/docs/android_emulator.md
@@ -28,14 +28,10 @@
| `generic_android22.textpb` | L | google_apis | N/A |
| `generic_android23.textpb` | M | google_apis | [android-marshmallow-x86-rel][android-marshmallow-x86-rel] |
| `generic_android27.textpb` | O | google_apis | N/A |
-| `generic_playstore_android27.textpb` | O | google_apis_playstore | N/A |
| `generic_android28.textpb` | P | google_apis | [android-pie-x86-rel][android-pie-x86-rel] |
-| `generic_playstore_android28.textpb` | P | google_apis_playstore | [android-pie-x86-rel][android-pie-x86-rel] |
| `generic_android29.textpb` | 10 (Q) | google_apis | N/A |
| `generic_android30.textpb` | 11 (R) | google_apis | [android-11-x86-rel][android-11-x86-rel] |
-| `generic_playstore_android30.textpb` | 11 (R) | google_apis_playstore | [android-11-x86-rel][android-11-x86-rel] |
| `generic_android31.textpb` | 12 (S) | google_apis | [android-12-x64-rel][android-12-x64-rel] |
-| `generic_playstore_android31.textpb` | 12 (S) | google_apis_playstore | [android-12-x64-rel][android-12-x64-rel] |
You can use these configuration files to run the same emulator images locally.
@@ -154,14 +150,12 @@
* `--wipe-data`
- Since the prebuilt playstore images use adbkey from the GCE bots that created
- them, they may appear to be "unauthorized" when used locally. Pass this flag
- to reset the user data image locally to fix it after installing a prebuilt
- image:
+ Reset the /data partition to the factory defaults. This removes all user
+ settings from the AVD.
```
$ tools/android/avd/avd.py start \
- --avd-config tools/android/avd/proto/generic_playstore_android28.textpb \
+ --avd-config tools/android/avd/proto/generic_android28.textpb \
--wipe-data
```
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index d273797..f1a56f3 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -28052,23 +28052,15 @@
' "tools/android/avd/proto/creation/generic_android22.textpb",'
' "tools/android/avd/proto/creation/generic_android23.textpb",'
' "tools/android/avd/proto/creation/generic_android24.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android24.textpb",'
' "tools/android/avd/proto/creation/generic_android25.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android25.textpb",'
' "tools/android/avd/proto/creation/generic_android26.textpb",'
' "tools/android/avd/proto/creation/generic_android27.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android27.textpb",'
' "tools/android/avd/proto/creation/generic_android28.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android28.textpb",'
' "tools/android/avd/proto/creation/generic_android29.textpb",'
' "tools/android/avd/proto/creation/generic_android30.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android30.textpb",'
' "tools/android/avd/proto/creation/generic_android31.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android31.textpb",'
' "tools/android/avd/proto/creation/generic_android32_foldable.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android32_foldable.textpb",'
- ' "tools/android/avd/proto/creation/generic_android33.textpb",'
- ' "tools/android/avd/proto/creation/generic_playstore_android33.textpb"'
+ ' "tools/android/avd/proto/creation/generic_android33.textpb"'
' ],'
' "gclient_apply_config": ['
' "android"'
@@ -32450,18 +32442,10 @@
' "sdk_package_name": "system-images;android-24;google_apis;x86"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-24/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-24;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-25/google_apis/x86.yaml",'
' "sdk_package_name": "system-images;android-25;google_apis;x86"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-25/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-25;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-26/google_apis/x86.yaml",'
' "sdk_package_name": "system-images;android-26;google_apis;x86"'
' },'
@@ -32470,26 +32454,14 @@
' "sdk_package_name": "system-images;android-27;google_apis;x86"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-27;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml",'
' "sdk_package_name": "system-images;android-28;google_apis;x86"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-28;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml",'
' "sdk_package_name": "system-images;android-29;google_apis;x86"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-29;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml",'
' "sdk_package_name": "system-images;android-30;google_apis;x86"'
' },'
@@ -32502,10 +32474,6 @@
' "sdk_package_name": "system-images;android-30;google_atd;x86_64"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml",'
- ' "sdk_package_name": "system-images;android-30;google_apis_playstore;x86"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-31/google_apis/arm64.yaml",'
' "sdk_package_name": "system-images;android-31;google_apis;arm64-v8a"'
' },'
@@ -32518,10 +32486,6 @@
' "sdk_package_name": "system-images;android-31;google_atd;x86_64"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-31/google_apis_playstore/x86_64.yaml",'
- ' "sdk_package_name": "system-images;android-31;google_apis_playstore;x86_64"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml",'
' "sdk_package_name": "system-images;android-32;google_apis;x86_64"'
' },'
@@ -32530,10 +32494,6 @@
' "sdk_package_name": "system-images;android-32;google_atd;x86_64"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml",'
- ' "sdk_package_name": "system-images;android-32;google_apis_playstore;x86_64"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-33/google_apis/x86_64.yaml",'
' "sdk_package_name": "system-images;android-33;google_apis;x86_64"'
' },'
@@ -32542,20 +32502,8 @@
' "sdk_package_name": "system-images;android-33;google_atd;x86_64"'
' },'
' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-33/google_apis_playstore/x86_64.yaml",'
- ' "sdk_package_name": "system-images;android-33;google_apis_playstore;x86_64"'
- ' },'
- ' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64.yaml",'
- ' "sdk_package_name": "system-images;android-TiramisuPrivacySandbox;google_apis_playstore;x86_64"'
- ' },'
- ' {'
' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-34/google_apis/x86_64.yaml",'
' "sdk_package_name": "system-images;android-34;google_apis;x86_64"'
- ' },'
- ' {'
- ' "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-34/google_apis_playstore/x86_64.yaml",'
- ' "sdk_package_name": "system-images;android-34;google_apis_playstore;x86_64"'
' }'
' ],'
' "recipe": "android/sdk_packager"'
diff --git a/infra/config/subprojects/chromium/ci/chromium.infra.star b/infra/config/subprojects/chromium/ci/chromium.infra.star
index 3827c7d..d4ad645 100644
--- a/infra/config/subprojects/chromium/ci/chromium.infra.star
+++ b/infra/config/subprojects/chromium/ci/chromium.infra.star
@@ -133,23 +133,15 @@
"tools/android/avd/proto/creation/generic_android22.textpb",
"tools/android/avd/proto/creation/generic_android23.textpb",
"tools/android/avd/proto/creation/generic_android24.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android24.textpb",
"tools/android/avd/proto/creation/generic_android25.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android25.textpb",
"tools/android/avd/proto/creation/generic_android26.textpb",
"tools/android/avd/proto/creation/generic_android27.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android27.textpb",
"tools/android/avd/proto/creation/generic_android28.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android28.textpb",
"tools/android/avd/proto/creation/generic_android29.textpb",
"tools/android/avd/proto/creation/generic_android30.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android30.textpb",
"tools/android/avd/proto/creation/generic_android31.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android31.textpb",
"tools/android/avd/proto/creation/generic_android32_foldable.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android32_foldable.textpb",
"tools/android/avd/proto/creation/generic_android33.textpb",
- "tools/android/avd/proto/creation/generic_playstore_android33.textpb",
],
"gclient_config": "chromium",
"gclient_apply_config": ["android"],
@@ -231,18 +223,10 @@
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-24/google_apis/x86.yaml",
},
{
- "sdk_package_name": "system-images;android-24;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-24/google_apis_playstore/x86.yaml",
- },
- {
"sdk_package_name": "system-images;android-25;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-25/google_apis/x86.yaml",
},
{
- "sdk_package_name": "system-images;android-25;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-25/google_apis_playstore/x86.yaml",
- },
- {
"sdk_package_name": "system-images;android-26;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-26/google_apis/x86.yaml",
},
@@ -251,26 +235,14 @@
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis/x86.yaml",
},
{
- "sdk_package_name": "system-images;android-27;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-27/google_apis_playstore/x86.yaml",
- },
- {
"sdk_package_name": "system-images;android-28;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml",
},
{
- "sdk_package_name": "system-images;android-28;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml",
- },
- {
"sdk_package_name": "system-images;android-29;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis/x86.yaml",
},
{
- "sdk_package_name": "system-images;android-29;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-29/google_apis_playstore/x86.yaml",
- },
- {
"sdk_package_name": "system-images;android-30;google_apis;x86",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis/x86.yaml",
},
@@ -282,10 +254,6 @@
"sdk_package_name": "system-images;android-30;google_atd;x86_64",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_atd/x86_64.yaml",
},
- {
- "sdk_package_name": "system-images;android-30;google_apis_playstore;x86",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-30/google_apis_playstore/x86.yaml",
- },
# use x86_64 since sdkmanager don't ship x86 for android-31 and above.
{
"sdk_package_name": "system-images;android-31;google_apis;arm64-v8a",
@@ -300,10 +268,6 @@
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-31/google_atd/x86_64.yaml",
},
{
- "sdk_package_name": "system-images;android-31;google_apis_playstore;x86_64",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-31/google_apis_playstore/x86_64.yaml",
- },
- {
"sdk_package_name": "system-images;android-32;google_apis;x86_64",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis/x86_64.yaml",
},
@@ -312,10 +276,6 @@
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_atd/x86_64.yaml",
},
{
- "sdk_package_name": "system-images;android-32;google_apis_playstore;x86_64",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-32/google_apis_playstore/x86_64.yaml",
- },
- {
"sdk_package_name": "system-images;android-33;google_apis;x86_64",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-33/google_apis/x86_64.yaml",
},
@@ -324,21 +284,9 @@
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-33/google_atd/x86_64.yaml",
},
{
- "sdk_package_name": "system-images;android-33;google_apis_playstore;x86_64",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-33/google_apis_playstore/x86_64.yaml",
- },
- {
- "sdk_package_name": "system-images;android-TiramisuPrivacySandbox;google_apis_playstore;x86_64",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64.yaml",
- },
- {
"sdk_package_name": "system-images;android-34;google_apis;x86_64",
"cipd_yaml": "third_party/android_sdk/cipd/system_images/android-34/google_apis/x86_64.yaml",
},
- {
- "sdk_package_name": "system-images;android-34;google_apis_playstore;x86_64",
- "cipd_yaml": "third_party/android_sdk/cipd/system_images/android-34/google_apis_playstore/x86_64.yaml",
- },
],
},
)
diff --git a/tools/android/avd/proto/creation/generic_playstore_android24.textpb b/tools/android/avd/proto/creation/generic_playstore_android24.textpb
deleted file mode 100644
index 17c9d3a..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android24.textpb
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-24 AVD with the Playstore.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "KUbHEU8j3yFnPWB_61mplm5-Mpm1bJ-cRDeDzTHK3hkC" # 31.2.8
- dest_path: "generic_playstore_android24"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-24/google_apis_playstore/x86"
- version: "Ojw5nKhSYXGt87HR42bLyeDhuHUByNUnuItEn7t6n3IC" # 19
- dest_path: "generic_playstore_android24"
-}
-system_image_name: "system-images;android-24;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-24/google_apis_playstore/x86"
- dest_path: "generic_playstore_android24"
-}
-avd_name: "android_24_google_apis_playstore_x86"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
- # Tests can run into low memory issue with the default ram size 1024MB
- # Incease to 2048MB, which is the same as that on Nexus 5X
- ram_size: 2048
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android25.textpb b/tools/android/avd/proto/creation/generic_playstore_android25.textpb
deleted file mode 100644
index 5f96498..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android25.textpb
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-25 AVD with the Playstore.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "Dogc_gNCYNb3fIG-ovlMkV5EhjaYwdA_Jw9goUpl3A8C" # 30.7.5
- dest_path: "generic_playstore_android25"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-25/google_apis_playstore/x86"
- version: "Rht9Yif4b426j-QxQkQ2YmV7bL0Ailjb_0ux4PaIsbUC" # 9
- dest_path: "generic_playstore_android25"
-}
-system_image_name: "system-images;android-25;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-25/google_apis_playstore/x86"
- dest_path: "generic_playstore_android25"
-}
-avd_name: "android_25_google_apis_playstore_x86"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
- # Tests can run into low memory issue with the default ram size 1024MB
- # Incease to 2048MB, which is the same as that on Nexus 5X
- ram_size: 2048
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android27.textpb b/tools/android/avd/proto/creation/generic_playstore_android27.textpb
deleted file mode 100644
index 246e647..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android27.textpb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-27 AVD with the Playstore.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "Dogc_gNCYNb3fIG-ovlMkV5EhjaYwdA_Jw9goUpl3A8C" # 30.7.5
- dest_path: "generic_playstore_android27"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-27/google_apis_playstore/x86"
- version: "7gFvg7QBjOACFoD3l3hWam6jxMwH4NOWUKnvdQbRo1UC" # 3
- dest_path: "generic_playstore_android27"
-}
-system_image_name: "system-images;android-27;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-27/google_apis_playstore/x86"
- dest_path: "generic_playstore_android27"
-}
-avd_name: "android_27_google_apis_playstore_x86"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android28.textpb b/tools/android/avd/proto/creation/generic_playstore_android28.textpb
deleted file mode 100644
index e38154b2..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android28.textpb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-28 AVD.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "Dogc_gNCYNb3fIG-ovlMkV5EhjaYwdA_Jw9goUpl3A8C" # 30.7.5
- dest_path: "generic_playstore_android28"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-28/google_apis_playstore/x86"
- version: "ypyVIHZKfJqFfYlDJzi22Ty7iKT6zlzChE396PLyPF4C" # 9
- dest_path: "generic_playstore_android28"
-}
-system_image_name: "system-images;android-28;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-28/google_apis_playstore/x86"
- dest_path: "generic_playstore_android28"
-}
-avd_name: "android_28_google_apis_playstore_x86"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android30.textpb b/tools/android/avd/proto/creation/generic_playstore_android30.textpb
deleted file mode 100644
index fadfd77e..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android30.textpb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-30 AVD with play store app.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "bu8JqOzts8M0BgjNb5-vJm_GDswD0eg7duonNH22_NAC" # 30.9.5
- dest_path: "generic_playstore_android30"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-30/google_apis_playstore/x86"
- version: "eS0rt_vkP9z2bwBQNLkzX-iblTLRZ2bb7l1GGxWA5hIC" # r9, RSR1.201013.001
- dest_path: "generic_playstore_android30"
-}
-system_image_name: "system-images;android-30;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-30/google_apis_playstore/x86"
- dest_path: "generic_playstore_android30"
-}
-avd_name: "android_30_google_apis_playstore_x86"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android31.textpb b/tools/android/avd/proto/creation/generic_playstore_android31.textpb
deleted file mode 100644
index 3b76ea5..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android31.textpb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-12 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "bu8JqOzts8M0BgjNb5-vJm_GDswD0eg7duonNH22_NAC" # 30.9.5
- dest_path: "generic_playstore_android31"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-31/google_apis_playstore/x86_64"
- version: "t7kFwd4eG6gnwXYbPQfmWUOiwVjk_b-9tbjHSuRY6WQC" # r8, SE1A.211012.001
- dest_path: "generic_playstore_android31"
-}
-system_image_name: "system-images;android-31;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-31/google_apis_playstore/x86_64"
- dest_path: "generic_playstore_android31"
-}
-avd_name: "android_31_google_apis_playstore_x86_64"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android32_foldable.textpb b/tools/android/avd/proto/creation/generic_playstore_android32_foldable.textpb
deleted file mode 100644
index 432f54a..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android32_foldable.textpb
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-12L AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "vr0Vf27dh76-6sz87fx6tF-3br8crNIgxByTaYayuX4C" # 32.1.12
- dest_path: "generic_playstore_android32_foldable"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-32/google_apis_playstore/x86_64"
- version: "xoJXp1MgQDF88Ugr13tibZNiD66qrlaTiGw1BQWVENQC" # r3, S2B2.211203.006
- dest_path: "generic_playstore_android32_foldable"
-}
-system_image_name: "system-images;android-32;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-32/google_apis_playstore/x86_64"
- dest_path: "generic_playstore_android32_foldable"
-}
-avd_name: "android_32_foldable_google_apis_playstore_x86_64"
-
-# Mirror the configs of '7.6" Fold-in with outer display'
-avd_settings {
- screen {
- density: 420
- height: 2208
- width: 1768
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
- avd_properties {
- key: "hw.sensor.hinge"
- value: "yes"
- }
- avd_properties {
- key: "hw.sensor.hinge.count"
- value: "1"
- }
- avd_properties {
- key: "hw.sensor.hinge.type"
- value: "1"
- }
- avd_properties {
- key: "hw.sensor.hinge.ranges"
- value: "0-180"
- }
- avd_properties {
- key: "hw.sensor.hinge.defaults"
- value: "180"
- }
- avd_properties {
- key: "hw.sensor.hinge.areas"
- value: "884-0-1-2208"
- }
- avd_properties {
- # list of supported postures by index.
- # 0: unknown, 1: closed, 2: half-open, 3: open, 4: flipped, 5: tent
- key: "hw.sensor.posture_list"
- value: "1,2,3"
- }
- avd_properties {
- # start-end angle pairs which define each posture
- key: "hw.sensor.hinge_angles_posture_definitions"
- value: "0-30, 30-150, 150-180"
- }
-}
diff --git a/tools/android/avd/proto/creation/generic_playstore_android33.textpb b/tools/android/avd/proto/creation/generic_playstore_android33.textpb
deleted file mode 100644
index 3cefef2..0000000
--- a/tools/android/avd/proto/creation/generic_playstore_android33.textpb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-13 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "vr0Vf27dh76-6sz87fx6tF-3br8crNIgxByTaYayuX4C" # 32.1.12
- dest_path: "generic_playstore_android33"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-33/google_apis_playstore/x86_64"
- version: "zNsYsNmjunAoNpRur3d0lbIaUAbnPHy4xqojAFG5gHMC" # r7, TE1A.220922.010
- dest_path: "generic_playstore_android33"
-}
-system_image_name: "system-images;android-33;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-33/google_apis_playstore/x86_64"
- dest_path: "generic_playstore_android33"
-}
-avd_name: "android_33_google_apis_playstore_x86_64"
-
-avd_settings {
- screen {
- density: 480
- height: 1920
- width: 1080
- }
- advanced_features {
- key: "GLESDynamicVersion"
- value: "on"
- }
-}
diff --git a/tools/android/avd/proto/generic_playstore_android24.textpb b/tools/android/avd/proto/generic_playstore_android24.textpb
deleted file mode 100644
index fbb4fea..0000000
--- a/tools/android/avd/proto/generic_playstore_android24.textpb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-24 AVD with playstore (user build)
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "KUbHEU8j3yFnPWB_61mplm5-Mpm1bJ-cRDeDzTHK3hkC" # 31.2.8
- dest_path: "generic_playstore_android24"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-24/google_apis_playstore/x86"
- version: "Ojw5nKhSYXGt87HR42bLyeDhuHUByNUnuItEn7t6n3IC" # 19
- dest_path: "generic_playstore_android24"
-}
-system_image_name: "system-images;android-24;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-24/google_apis_playstore/x86"
- # Created in https://ci.chromium.org/b/8819381886161538497
- version: "3pqakRkidFSzF6rs0z2BOg19ojnQsqYdJssqyNT-4dcC"
- dest_path: "generic_playstore_android24"
-}
-avd_name: "android_24_google_apis_playstore_x86"
diff --git a/tools/android/avd/proto/generic_playstore_android25.textpb b/tools/android/avd/proto/generic_playstore_android25.textpb
deleted file mode 100644
index 9ceb40a8..0000000
--- a/tools/android/avd/proto/generic_playstore_android25.textpb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-25 AVD with playstore (user build)
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "Dogc_gNCYNb3fIG-ovlMkV5EhjaYwdA_Jw9goUpl3A8C" # 30.7.5
- dest_path: "generic_playstore_android25"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-25/google_apis_playstore/x86"
- version: "Rht9Yif4b426j-QxQkQ2YmV7bL0Ailjb_0ux4PaIsbUC" # 9
- dest_path: "generic_playstore_android25"
-}
-system_image_name: "system-images;android-25;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-25/google_apis_playstore/x86"
- # Created in https://ci.chromium.org/b/8819765969004099233
- version: "n4TCpx2LFg0J8dXZzfhADg5zLGNt6DH-6zKvvjYcRIgC"
- dest_path: "generic_playstore_android25"
-}
-avd_name: "android_25_google_apis_playstore_x86"
diff --git a/tools/android/avd/proto/generic_playstore_android27.textpb b/tools/android/avd/proto/generic_playstore_android27.textpb
deleted file mode 100644
index c0938f4..0000000
--- a/tools/android/avd/proto/generic_playstore_android27.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-27 AVD with the Playstore.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "Dogc_gNCYNb3fIG-ovlMkV5EhjaYwdA_Jw9goUpl3A8C" # 30.7.5
- dest_path: "generic_playstore_android27"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-27/google_apis_playstore/x86"
- version: "7gFvg7QBjOACFoD3l3hWam6jxMwH4NOWUKnvdQbRo1UC" # 3
- dest_path: "generic_playstore_android27"
-}
-system_image_name: "system-images;android-27;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-27/google_apis_playstore/x86"
- version: "iOFUcNGmmxJI_Z9n7uhRnOsfB1dwVmZgweEyRKg45JEC" # created in bb_id 8839810454095989792
- dest_path: "generic_playstore_android27"
-}
-avd_name: "android_27_google_apis_playstore_x86"
diff --git a/tools/android/avd/proto/generic_playstore_android28.textpb b/tools/android/avd/proto/generic_playstore_android28.textpb
deleted file mode 100644
index f5adf76..0000000
--- a/tools/android/avd/proto/generic_playstore_android28.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-28 AVD.
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "lnt2Oz8NS73mAJL389R1QwgbM2qDSKNIRWTUOdmywukC"
- dest_path: "generic_playstore_android28"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-28/google_apis_playstore/x86"
- version: "aHLrqkrOa04ksjgo_LhSRx9V9P_FKxFqEJohj9cYsBUC"
- dest_path: "generic_playstore_android28"
-}
-system_image_name: "system-images;android-28;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-28/google_apis_playstore/x86"
- version: "bmg8zBF8218BBIET9QlBTJvCtf1Pn1KN4jqJNkp2JlcC"
- dest_path: "generic_playstore_android28"
-}
-avd_name: "android_28_google_apis_playstore_x86"
diff --git a/tools/android/avd/proto/generic_playstore_android30.textpb b/tools/android/avd/proto/generic_playstore_android30.textpb
deleted file mode 100644
index 604efd8..0000000
--- a/tools/android/avd/proto/generic_playstore_android30.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86 android-30 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "iyhul4Fb1wyCHoMUUxoRoy_8gaCnX2qhZ90-6c2bzd0C" # 30.7.4
- dest_path: "generic_playstore_android30"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-30/google_apis_playstore/x86"
- version: "1ShvIJk3-tzuDO4Kui3Qtobt-6hkQd42qhV60Q_wNmUC" # version:9
- dest_path: "generic_playstore_android30"
-}
-system_image_name: "system-images;android-30;google_apis_playstore;x86"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-30/google_apis_playstore/x86"
- version: "KZ8egkMqSIe0_DK_NmVoTaiVixqrMGklAp2a6F6xSYAC" # created in bb_id 8840351132621657713
- dest_path: "generic_playstore_android30"
-}
-avd_name: "android_30_google_apis_playstore_x86"
diff --git a/tools/android/avd/proto/generic_playstore_android31.textpb b/tools/android/avd/proto/generic_playstore_android31.textpb
deleted file mode 100644
index 44084811..0000000
--- a/tools/android/avd/proto/generic_playstore_android31.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-12 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "bu8JqOzts8M0BgjNb5-vJm_GDswD0eg7duonNH22_NAC" # 30.9.5
- dest_path: "generic_playstore_android31"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-31/google_apis_playstore/x86_64"
- version: "t7kFwd4eG6gnwXYbPQfmWUOiwVjk_b-9tbjHSuRY6WQC" # r8, SE1A.211012.001
- dest_path: "generic_playstore_android31"
-}
-system_image_name: "system-images;android-31;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-31/google_apis_playstore/x86_64"
- version: "TYanZ5Ip3bvB8rVa-j6mSQlVteovYm8piWh5c8I0EJ0C" # created in bb_id 8832717681350063217
- dest_path: "generic_playstore_android31"
-}
-avd_name: "android_31_google_apis_playstore_x86_64"
diff --git a/tools/android/avd/proto/generic_playstore_android33.textpb b/tools/android/avd/proto/generic_playstore_android33.textpb
deleted file mode 100644
index 9e4d40417..0000000
--- a/tools/android/avd/proto/generic_playstore_android33.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-13 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "vr0Vf27dh76-6sz87fx6tF-3br8crNIgxByTaYayuX4C" # 32.1.12
- dest_path: "generic_playstore_android33"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-33/google_apis_playstore/x86_64"
- version: "zNsYsNmjunAoNpRur3d0lbIaUAbnPHy4xqojAFG5gHMC" # r7, TE1A.220922.010
- dest_path: "generic_playstore_android33"
-}
-system_image_name: "system-images;android-33;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-33/google_apis_playstore/x86_64"
- version: "WCt8yn3D9-RDU0mAYNIJvSA-G26X8Or1fBlKuAsTPDoC"
- dest_path: "generic_playstore_android33"
-}
-avd_name: "android_33_google_apis_playstore_x86_64"
diff --git a/tools/android/avd/proto/generic_playstore_android34.textpb b/tools/android/avd/proto/generic_playstore_android34.textpb
deleted file mode 100644
index 93dcf5a..0000000
--- a/tools/android/avd/proto/generic_playstore_android34.textpb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Configuration for a generic x86_64 android-14 AVD with playstore (user build).
-
-emulator_package {
- package_name: "chromium/third_party/android_sdk/public/emulator"
- version: "N0gQj09CUhpE7QRA3E_tXn2hi-tyW_uSHUXJUILp5AoC" # 32.1.13
- dest_path: "generic_playstore_android34"
-}
-
-system_image_package {
- package_name: "chromium/third_party/android_sdk/public/system-images/android-34/google_apis_playstore/x86_64"
- version: "BRXsfpCMqppNHrUV7QPHOeyA1nXldEILVsoj6g94lFYC" # r6, UPB3.230519.006
- dest_path: "generic_playstore_android34"
-}
-system_image_name: "system-images;android-34;google_apis_playstore;x86_64"
-
-avd_package {
- package_name: "chromium/third_party/android_sdk/public/avds/android-34/google_apis_playstore/x86_64"
- version: "JEE3FdVhwg_68dww3eGfdJadh_VQVGK5odRys38jioYC" # created in bb_id 8777600060006860961
- dest_path: "generic_playstore_android34"
-}
-avd_name: "android_34_google_apis_playstore_x86_64"