Update the emulator versions and expose cipd. (flutter#6025)

ricardoamador · web-flow · commit 0f677d370a1f · 2024-02-01T23:52:32.000Z
Update the android virtual device to use the proto config as the version instead of the integer version. This is more robust from the recipes side as the chromium team is changing names. Expose the avd_cipd_version flag so developers can update this without touching recipes. *List which issues are fixed by this PR. You must list at least one issue.* Fixes flutter#142261 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
diff --git a/.ci.yaml b/.ci.yaml
@@ -27,7 +27,8 @@ platform_properties:
         [
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:17"},
-          {"dependency": "curl", "version": "version:7.64.0"}
+          {"dependency": "curl", "version": "version:7.64.0"},
+          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
         ]
   linux_android_legacy:
     properties:
@@ -39,7 +40,8 @@ platform_properties:
           {"dependency": "android_sdk", "version": "version:33v6"},
           {"dependency": "open_jdk", "version": "version:17"},
           {"dependency": "curl", "version": "version:7.64.0"},
-          {"dependency": "android_virtual_device", "version": "22"}
+          {"dependency": "android_virtual_device", "version": "generic_android22.textpb"},
+          {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}
         ]
   linux_desktop:
     properties:
@@ -321,7 +323,7 @@ targets:
       # web_benchmarks needs Chrome.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"},
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -342,7 +344,7 @@ targets:
       # See comments on 'master' version above.
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"},
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},
           {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
           {"dependency": "chrome_and_driver", "version": "version:114.0"}
         ]
@@ -403,7 +405,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -422,7 +424,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -441,7 +443,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -460,7 +462,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -479,7 +481,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -498,7 +500,7 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -517,7 +519,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 2"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -536,7 +538,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 2"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -555,7 +557,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -574,7 +576,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -593,7 +595,7 @@ targets:
       package_sharding: "--shardIndex 2 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -612,7 +614,7 @@ targets:
       package_sharding: "--shardIndex 3 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -631,7 +633,7 @@ targets:
       package_sharding: "--shardIndex 4 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -650,7 +652,7 @@ targets:
       package_sharding: "--shardIndex 5 --shardCount 6"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "34"}
+          {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -668,7 +670,7 @@ targets:
       package_sharding: "--shardIndex 0 --shardCount 2"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {
@@ -686,7 +688,7 @@ targets:
       package_sharding: "--shardIndex 1 --shardCount 2"
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "33"}
+          {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
         ]
       env_variables: >-
         {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ platform_properties:`
`27`	`27`	`[`
`28`	`28`	`{"dependency": "android_sdk", "version": "version:33v6"},`
`29`	`29`	`{"dependency": "open_jdk", "version": "version:17"},`
`30`		`- {"dependency": "curl", "version": "version:7.64.0"}`
	`30`	`+ {"dependency": "curl", "version": "version:7.64.0"},`
	`31`	`+ {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}`
`31`	`32`	`]`
`32`	`33`	`linux_android_legacy:`
`33`	`34`	`properties:`
`@@ -39,7 +40,8 @@ platform_properties:`
`39`	`40`	`{"dependency": "android_sdk", "version": "version:33v6"},`
`40`	`41`	`{"dependency": "open_jdk", "version": "version:17"},`
`41`	`42`	`{"dependency": "curl", "version": "version:7.64.0"},`
`42`		`- {"dependency": "android_virtual_device", "version": "22"}`
	`43`	`+ {"dependency": "android_virtual_device", "version": "generic_android22.textpb"},`
	`44`	`+ {"dependency": "avd_cipd_version", "version": "build_id:8759428741582061553"}`
`43`	`45`	`]`
`44`	`46`	`linux_desktop:`
`45`	`47`	`properties:`
`@@ -321,7 +323,7 @@ targets:`
`321`	`323`	`# web_benchmarks needs Chrome.`
`322`	`324`	`dependencies: >-`
`323`	`325`	`[`
`324`		`- {"dependency": "android_virtual_device", "version": "34"},`
	`326`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},`
`325`	`327`	`{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},`
`326`	`328`	`{"dependency": "chrome_and_driver", "version": "version:114.0"}`
`327`	`329`	`]`
`@@ -342,7 +344,7 @@ targets:`
`342`	`344`	`# See comments on 'master' version above.`
`343`	`345`	`dependencies: >-`
`344`	`346`	`[`
`345`		`- {"dependency": "android_virtual_device", "version": "34"},`
	`347`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"},`
`346`	`348`	`{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},`
`347`	`349`	`{"dependency": "chrome_and_driver", "version": "version:114.0"}`
`348`	`350`	`]`
`@@ -403,7 +405,7 @@ targets:`
`403`	`405`	`package_sharding: "--shardIndex 0 --shardCount 6"`
`404`	`406`	`dependencies: >-`
`405`	`407`	`[`
`406`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`408`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`407`	`409`	`]`
`408`	`410`	`env_variables: >-`
`409`	`411`	`{`
`@@ -422,7 +424,7 @@ targets:`
`422`	`424`	`package_sharding: "--shardIndex 1 --shardCount 6"`
`423`	`425`	`dependencies: >-`
`424`	`426`	`[`
`425`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`427`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`426`	`428`	`]`
`427`	`429`	`env_variables: >-`
`428`	`430`	`{`
`@@ -441,7 +443,7 @@ targets:`
`441`	`443`	`package_sharding: "--shardIndex 2 --shardCount 6"`
`442`	`444`	`dependencies: >-`
`443`	`445`	`[`
`444`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`446`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`445`	`447`	`]`
`446`	`448`	`env_variables: >-`
`447`	`449`	`{`
`@@ -460,7 +462,7 @@ targets:`
`460`	`462`	`package_sharding: "--shardIndex 3 --shardCount 6"`
`461`	`463`	`dependencies: >-`
`462`	`464`	`[`
`463`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`465`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`464`	`466`	`]`
`465`	`467`	`env_variables: >-`
`466`	`468`	`{`
`@@ -479,7 +481,7 @@ targets:`
`479`	`481`	`package_sharding: "--shardIndex 4 --shardCount 6"`
`480`	`482`	`dependencies: >-`
`481`	`483`	`[`
`482`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`484`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`483`	`485`	`]`
`484`	`486`	`env_variables: >-`
`485`	`487`	`{`
`@@ -498,7 +500,7 @@ targets:`
`498`	`500`	`package_sharding: "--shardIndex 5 --shardCount 6"`
`499`	`501`	`dependencies: >-`
`500`	`502`	`[`
`501`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`503`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`502`	`504`	`]`
`503`	`505`	`env_variables: >-`
`504`	`506`	`{`
`@@ -517,7 +519,7 @@ targets:`
`517`	`519`	`package_sharding: "--shardIndex 0 --shardCount 2"`
`518`	`520`	`dependencies: >-`
`519`	`521`	`[`
`520`		`- {"dependency": "android_virtual_device", "version": "33"}`
	`522`	`+ {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}`
`521`	`523`	`]`
`522`	`524`	`env_variables: >-`
`523`	`525`	`{`
`@@ -536,7 +538,7 @@ targets:`
`536`	`538`	`package_sharding: "--shardIndex 1 --shardCount 2"`
`537`	`539`	`dependencies: >-`
`538`	`540`	`[`
`539`		`- {"dependency": "android_virtual_device", "version": "33"}`
	`541`	`+ {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}`
`540`	`542`	`]`
`541`	`543`	`env_variables: >-`
`542`	`544`	`{`
`@@ -555,7 +557,7 @@ targets:`
`555`	`557`	`package_sharding: "--shardIndex 0 --shardCount 6"`
`556`	`558`	`dependencies: >-`
`557`	`559`	`[`
`558`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`560`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`559`	`561`	`]`
`560`	`562`	`env_variables: >-`
`561`	`563`	`{`
`@@ -574,7 +576,7 @@ targets:`
`574`	`576`	`package_sharding: "--shardIndex 1 --shardCount 6"`
`575`	`577`	`dependencies: >-`
`576`	`578`	`[`
`577`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`579`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`578`	`580`	`]`
`579`	`581`	`env_variables: >-`
`580`	`582`	`{`
`@@ -593,7 +595,7 @@ targets:`
`593`	`595`	`package_sharding: "--shardIndex 2 --shardCount 6"`
`594`	`596`	`dependencies: >-`
`595`	`597`	`[`
`596`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`598`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`597`	`599`	`]`
`598`	`600`	`env_variables: >-`
`599`	`601`	`{`
`@@ -612,7 +614,7 @@ targets:`
`612`	`614`	`package_sharding: "--shardIndex 3 --shardCount 6"`
`613`	`615`	`dependencies: >-`
`614`	`616`	`[`
`615`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`617`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`616`	`618`	`]`
`617`	`619`	`env_variables: >-`
`618`	`620`	`{`
`@@ -631,7 +633,7 @@ targets:`
`631`	`633`	`package_sharding: "--shardIndex 4 --shardCount 6"`
`632`	`634`	`dependencies: >-`
`633`	`635`	`[`
`634`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`636`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`635`	`637`	`]`
`636`	`638`	`env_variables: >-`
`637`	`639`	`{`
`@@ -650,7 +652,7 @@ targets:`
`650`	`652`	`package_sharding: "--shardIndex 5 --shardCount 6"`
`651`	`653`	`dependencies: >-`
`652`	`654`	`[`
`653`		`- {"dependency": "android_virtual_device", "version": "34"}`
	`655`	`+ {"dependency": "android_virtual_device", "version": "android_34_google_apis_x64.textpb"}`
`654`	`656`	`]`
`655`	`657`	`env_variables: >-`
`656`	`658`	`{`
`@@ -668,7 +670,7 @@ targets:`
`668`	`670`	`package_sharding: "--shardIndex 0 --shardCount 2"`
`669`	`671`	`dependencies: >-`
`670`	`672`	`[`
`671`		`- {"dependency": "android_virtual_device", "version": "33"}`
	`673`	`+ {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}`
`672`	`674`	`]`
`673`	`675`	`env_variables: >-`
`674`	`676`	`{`
`@@ -686,7 +688,7 @@ targets:`
`686`	`688`	`package_sharding: "--shardIndex 1 --shardCount 2"`
`687`	`689`	`dependencies: >-`
`688`	`690`	`[`
`689`		`- {"dependency": "android_virtual_device", "version": "33"}`
	`691`	`+ {"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}`
`690`	`692`	`]`
`691`	`693`	`env_variables: >-`
`692`	`694`	`{`