emulator: Add gmscore 23.45.23 to AVD creation configs on API 28+
Also rename them to align with the new naming scheme, as described
in //tools/android/avd/proto/README.md
Bug: 1482461
Change-Id: I99847aadb0af6fab7ed8f7493a8e143cffab311c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5124112
Reviewed-by: Arthur Wang <wuwang@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/main@{#1237828}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 9f65a88f..c18d070 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -30185,25 +30185,25 @@
'{'
' "$build/avd_packager": {'
' "avd_configs": ['
+ ' "tools/android/avd/proto/creation/android_28_google_apis_x86.textpb",'
+ ' "tools/android/avd/proto/creation/android_29_google_apis_x86.textpb",'
+ ' "tools/android/avd/proto/creation/android_30_google_apis_x86.textpb",'
+ ' "tools/android/avd/proto/creation/android_31_google_apis_x64.textpb",'
+ ' "tools/android/avd/proto/creation/android_32_google_apis_x64_foldable.textpb",'
+ ' "tools/android/avd/proto/creation/android_33_google_apis_x64.textpb",'
+ ' "tools/android/avd/proto/creation/android_34_google_apis_x64.textpb",'
' "tools/android/avd/proto/creation/android_30_google_atd_x86.textpb",'
' "tools/android/avd/proto/creation/android_30_google_atd_x64.textpb",'
' "tools/android/avd/proto/creation/android_31_google_atd_x64.textpb",'
' "tools/android/avd/proto/creation/android_32_google_atd_x64_foldable.textpb",'
' "tools/android/avd/proto/creation/android_33_google_atd_x64.textpb",'
- ' "tools/android/avd/proto/creation/android_34_google_apis_x64.textpb",'
' "tools/android/avd/proto/creation/generic_android19.textpb",'
' "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_android25.textpb",'
' "tools/android/avd/proto/creation/generic_android26.textpb",'
- ' "tools/android/avd/proto/creation/generic_android27.textpb",'
- ' "tools/android/avd/proto/creation/generic_android28.textpb",'
- ' "tools/android/avd/proto/creation/generic_android29.textpb",'
- ' "tools/android/avd/proto/creation/generic_android30.textpb",'
- ' "tools/android/avd/proto/creation/generic_android31.textpb",'
- ' "tools/android/avd/proto/creation/generic_android32_foldable.textpb",'
- ' "tools/android/avd/proto/creation/generic_android33.textpb"'
+ ' "tools/android/avd/proto/creation/generic_android27.textpb"'
' ],'
' "gclient_apply_config": ['
' "android"'
diff --git a/infra/config/subprojects/chromium/ci/chromium.infra.star b/infra/config/subprojects/chromium/ci/chromium.infra.star
index b10e6d0d..99d993f 100644
--- a/infra/config/subprojects/chromium/ci/chromium.infra.star
+++ b/infra/config/subprojects/chromium/ci/chromium.infra.star
@@ -146,12 +146,22 @@
properties = {
"$build/avd_packager": {
"avd_configs": [
+ # google_apis system images
+ "tools/android/avd/proto/creation/android_28_google_apis_x86.textpb",
+ "tools/android/avd/proto/creation/android_29_google_apis_x86.textpb",
+ "tools/android/avd/proto/creation/android_30_google_apis_x86.textpb",
+ "tools/android/avd/proto/creation/android_31_google_apis_x64.textpb",
+ "tools/android/avd/proto/creation/android_32_google_apis_x64_foldable.textpb",
+ "tools/android/avd/proto/creation/android_33_google_apis_x64.textpb",
+ "tools/android/avd/proto/creation/android_34_google_apis_x64.textpb",
+
+ # google_atd system images
"tools/android/avd/proto/creation/android_30_google_atd_x86.textpb",
"tools/android/avd/proto/creation/android_30_google_atd_x64.textpb",
"tools/android/avd/proto/creation/android_31_google_atd_x64.textpb",
"tools/android/avd/proto/creation/android_32_google_atd_x64_foldable.textpb",
"tools/android/avd/proto/creation/android_33_google_atd_x64.textpb",
- "tools/android/avd/proto/creation/android_34_google_apis_x64.textpb",
+
# TODO(hypan): Using more specific names for the configs below.
"tools/android/avd/proto/creation/generic_android19.textpb",
"tools/android/avd/proto/creation/generic_android22.textpb",
@@ -160,12 +170,6 @@
"tools/android/avd/proto/creation/generic_android25.textpb",
"tools/android/avd/proto/creation/generic_android26.textpb",
"tools/android/avd/proto/creation/generic_android27.textpb",
- "tools/android/avd/proto/creation/generic_android28.textpb",
- "tools/android/avd/proto/creation/generic_android29.textpb",
- "tools/android/avd/proto/creation/generic_android30.textpb",
- "tools/android/avd/proto/creation/generic_android31.textpb",
- "tools/android/avd/proto/creation/generic_android32_foldable.textpb",
- "tools/android/avd/proto/creation/generic_android33.textpb",
],
"gclient_config": "chromium",
"gclient_apply_config": ["android"],
diff --git a/tools/android/avd/proto/creation/generic_android28.textpb b/tools/android/avd/proto/creation/android_28_google_apis_x86.textpb
similarity index 67%
rename from tools/android/avd/proto/creation/generic_android28.textpb
rename to tools/android/avd/proto/creation/android_28_google_apis_x86.textpb
index 5cee08f..ff9cf92 100644
--- a/tools/android/avd/proto/creation/generic_android28.textpb
+++ b/tools/android/avd/proto/creation/android_28_google_apis_x86.textpb
@@ -2,24 +2,24 @@
# 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.
+# Configuration for an Android Pie (API 28) AVD on google_apis on x86
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android28"
+ dest_path: "android_28_google_apis_x86"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-28/google_apis/x86"
version: "n5ghWmdJtOyffzCTuQwcIHCz34tTB6Cac9gJGU5pCMAC" # r12
- dest_path: "generic_android28"
+ dest_path: "android_28_google_apis_x86"
}
system_image_name: "system-images;android-28;google_apis;x86"
avd_package {
package_name: "chromium/third_party/android_sdk/public/avds/android-28/google_apis/x86"
- dest_path: "generic_android28"
+ dest_path: "android_28_google_apis_x86"
}
avd_name: "android_28_google_apis_x86"
@@ -34,3 +34,10 @@
value: "on"
}
}
+
+min_sdk: 28
+additional_apk {
+ package_name: "chrome_internal/third_party/google3/apks/gmscore/x86"
+ version: "d3fTL5W2oRaqhhYdbk9SivHLBycVC3tlpplGGbsz6jgC"
+ dest_path: "android_28_google_apis_x86/gmscore_apks"
+}
diff --git a/tools/android/avd/proto/creation/generic_android29.textpb b/tools/android/avd/proto/creation/android_29_google_apis_x86.textpb
similarity index 67%
rename from tools/android/avd/proto/creation/generic_android29.textpb
rename to tools/android/avd/proto/creation/android_29_google_apis_x86.textpb
index b140e1e1..ca7c937 100644
--- a/tools/android/avd/proto/creation/generic_android29.textpb
+++ b/tools/android/avd/proto/creation/android_29_google_apis_x86.textpb
@@ -2,24 +2,24 @@
# 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-29 AVD.
+# Configuration for an Android-10 (Q, API 29) AVD on google_apis on x86
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android29"
+ dest_path: "android_29_google_apis_x86"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-29/google_apis/x86"
version: "9cGIyFNG8n9H3gwo2Vgs88BWlGztVAy8eJsKIXsL6zcC" # r12
- dest_path: "generic_android29"
+ dest_path: "android_29_google_apis_x86"
}
system_image_name: "system-images;android-29;google_apis;x86"
avd_package {
package_name: "chromium/third_party/android_sdk/public/avds/android-29/google_apis/x86"
- dest_path: "generic_android29"
+ dest_path: "android_29_google_apis_x86"
}
avd_name: "android_29_google_apis_x86"
@@ -34,3 +34,10 @@
value: "on"
}
}
+
+min_sdk: 29
+additional_apk {
+ package_name: "chrome_internal/third_party/google3/apks/gmscore/x86"
+ version: "d3fTL5W2oRaqhhYdbk9SivHLBycVC3tlpplGGbsz6jgC"
+ dest_path: "android_29_google_apis_x86/gmscore_apks"
+}
diff --git a/tools/android/avd/proto/creation/generic_android30.textpb b/tools/android/avd/proto/creation/android_30_google_apis_x86.textpb
similarity index 67%
rename from tools/android/avd/proto/creation/generic_android30.textpb
rename to tools/android/avd/proto/creation/android_30_google_apis_x86.textpb
index 72f9a78e..9fe2e39 100644
--- a/tools/android/avd/proto/creation/generic_android30.textpb
+++ b/tools/android/avd/proto/creation/android_30_google_apis_x86.textpb
@@ -2,24 +2,24 @@
# 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.
+# Configuration for an Android-11 (R, API 30) AVD on google_apis on x86
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android30"
+ dest_path: "android_30_google_apis_x86"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-30/google_apis/x86"
version: "cX-cza6YinY0j4RRlq-Orvef6P-GKKcmWiJllIj4UHgC" # r10
- dest_path: "generic_android30"
+ dest_path: "android_30_google_apis_x86"
}
system_image_name: "system-images;android-30;google_apis;x86"
avd_package {
package_name: "chromium/third_party/android_sdk/public/avds/android-30/google_apis/x86"
- dest_path: "generic_android30"
+ dest_path: "android_30_google_apis_x86"
}
avd_name: "android_30_google_apis_x86"
@@ -34,3 +34,10 @@
value: "on"
}
}
+
+min_sdk: 30
+additional_apk {
+ package_name: "chrome_internal/third_party/google3/apks/gmscore/x86"
+ version: "d3fTL5W2oRaqhhYdbk9SivHLBycVC3tlpplGGbsz6jgC"
+ dest_path: "android_30_google_apis_x86/gmscore_apks"
+}
diff --git a/tools/android/avd/proto/creation/generic_android31.textpb b/tools/android/avd/proto/creation/android_31_google_apis_x64.textpb
similarity index 64%
rename from tools/android/avd/proto/creation/generic_android31.textpb
rename to tools/android/avd/proto/creation/android_31_google_apis_x64.textpb
index 5b7d608..163f92d 100644
--- a/tools/android/avd/proto/creation/generic_android31.textpb
+++ b/tools/android/avd/proto/creation/android_31_google_apis_x64.textpb
@@ -2,26 +2,26 @@
# 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 (userdebug build).
+# Configuration for an Android-12 (S, API 31) AVD on google_apis on x86_64
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android31"
+ dest_path: "android_31_google_apis_x64"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-31/google_apis/x86_64"
version: "MYBnQWsww48BqFoQMJt3QC06pDAQNTtcAXZalvRNCY0C" # r14
- dest_path: "generic_android31"
+ dest_path: "android_31_google_apis_x64"
}
system_image_name: "system-images;android-31;google_apis;x86_64"
avd_package {
package_name: "chromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64"
- dest_path: "generic_android31"
+ dest_path: "android_31_google_apis_x64"
}
-avd_name: "android_31_google_apis_x86_64"
+avd_name: "android_31_google_apis_x64"
avd_settings {
screen {
@@ -34,3 +34,10 @@
value: "on"
}
}
+
+min_sdk: 31
+additional_apk {
+ package_name: "chrome_internal/third_party/google3/apks/gmscore/x86_64"
+ version: "yPyAJAHojVhJz8dfy28tCLyUidWpD95q2Zzj6JXJRkIC"
+ dest_path: "android_31_google_apis_x64/gmscore_apks"
+}
diff --git a/tools/android/avd/proto/creation/generic_android32_foldable.textpb b/tools/android/avd/proto/creation/android_32_google_apis_x64_foldable.textpb
similarity index 83%
rename from tools/android/avd/proto/creation/generic_android32_foldable.textpb
rename to tools/android/avd/proto/creation/android_32_google_apis_x64_foldable.textpb
index 5aa0df3..396dd07 100644
--- a/tools/android/avd/proto/creation/generic_android32_foldable.textpb
+++ b/tools/android/avd/proto/creation/android_32_google_apis_x64_foldable.textpb
@@ -2,26 +2,26 @@
# 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 (userdebug build).
+# Configuration for an Android-12L (S_V2, API 32) AVD on google_apis on x86_64
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android32_foldable"
+ dest_path: "android_32_google_apis_x64_foldable"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-32/google_apis/x86_64"
version: "KK_VeEUvdJrxL7eEKvVnt_4bjZPRLsGPymVm6Ios5HEC" # r7
- dest_path: "generic_android32_foldable"
+ dest_path: "android_32_google_apis_x64_foldable"
}
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"
- dest_path: "generic_android32_foldable"
+ dest_path: "android_32_google_apis_x64_foldable"
}
-avd_name: "android_32_foldable_google_apis_x86_64"
+avd_name: "android_32_google_apis_x64_foldable"
# Mirror the configs of '7.6" Fold-in with outer display'
avd_settings {
@@ -88,10 +88,8 @@
}
min_sdk: 32
-install_privileged_apk_partition: "/product"
-
additional_apk {
package_name: "chrome_internal/third_party/google3/apks/gmscore/x86_64"
- version: "8YCNotfbM5tOtTRFFJNfDpolC4TMZt2N61WY66WI4JwC"
- dest_path: "generic_android32_foldable/gmscore_apks"
+ version: "yPyAJAHojVhJz8dfy28tCLyUidWpD95q2Zzj6JXJRkIC"
+ dest_path: "android_32_google_apis_x64_foldable/gmscore_apks"
}
diff --git a/tools/android/avd/proto/creation/generic_android33.textpb b/tools/android/avd/proto/creation/android_33_google_apis_x64.textpb
similarity index 64%
rename from tools/android/avd/proto/creation/generic_android33.textpb
rename to tools/android/avd/proto/creation/android_33_google_apis_x64.textpb
index 3f556c6..15baae69 100644
--- a/tools/android/avd/proto/creation/generic_android33.textpb
+++ b/tools/android/avd/proto/creation/android_33_google_apis_x64.textpb
@@ -2,26 +2,26 @@
# 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 (userdebug build).
+# Configuration for an Android-13 (T, API 33) AVD on google_apis on x86_64
emulator_package {
package_name: "chromium/third_party/android_sdk/public/emulator"
version: "N2X90_ADQtGKgoxkXZH3-TM5dbrynU-zGC4mj0B5KMIC" # 32.1.15
- dest_path: "generic_android33"
+ dest_path: "android_33_google_apis_x64"
}
system_image_package {
package_name: "chromium/third_party/android_sdk/public/system-images/android-33/google_apis/x86_64"
version: "4c9il1xIZwca_xJABnQ1KstiU1kFqzOonoQGdweA77cC" # r15
- dest_path: "generic_android33"
+ dest_path: "android_33_google_apis_x64"
}
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"
- dest_path: "generic_android33"
+ dest_path: "android_33_google_apis_x64"
}
-avd_name: "android_33_google_apis_x86_64"
+avd_name: "android_33_google_apis_x64"
avd_settings {
screen {
@@ -34,3 +34,10 @@
value: "on"
}
}
+
+min_sdk: 33
+additional_apk {
+ package_name: "chrome_internal/third_party/google3/apks/gmscore/x86_64"
+ version: "yPyAJAHojVhJz8dfy28tCLyUidWpD95q2Zzj6JXJRkIC"
+ dest_path: "android_33_google_apis_x64/gmscore_apks"
+}