Skip to content

F
Front-End
Unverified Commit 3b370c85 authored by Daco Harkes's avatar Daco Harkes Committed by GitHub
Browse files
Options

[deps] update Android SDK to 34 (#138183) 

Update Android SDK from 33 to 34.

Following the engine update:

* https://github.com/flutter/engine/pull/47839
parent 1ff76863
Show whitespace changes
Inline Side-by-side
Showing with 182 additions and 183 deletions
.ci.yaml
View file @ 3b370c85
...@@ -33,8 +33,8 @@ platform_properties: ...@@ -33,8 +33,8 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"} {"dependency": "curl", "version": "version:7.64.0"}
] ]
os: Ubuntu os: Ubuntu
...@@ -44,8 +44,8 @@ platform_properties: ...@@ -44,8 +44,8 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"} {"dependency": "curl", "version": "version:7.64.0"}
] ]
os: Linux os: Linux
...@@ -55,8 +55,8 @@ platform_properties: ...@@ -55,8 +55,8 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"} {"dependency": "curl", "version": "version:7.64.0"}
] ]
os: Linux os: Linux
...@@ -66,8 +66,8 @@ platform_properties: ...@@ -66,8 +66,8 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"} {"dependency": "curl", "version": "version:7.64.0"}
] ]
os: Linux os: Linux
...@@ -149,9 +149,9 @@ platform_properties: ...@@ -149,9 +149,9 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
os: Mac-12|Mac-13 os: Mac-12|Mac-13
cpu: x86 cpu: x86
...@@ -160,8 +160,8 @@ platform_properties: ...@@ -160,8 +160,8 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
os: Mac-12|Mac-13 os: Mac-12|Mac-13
cpu: arm64 cpu: arm64
...@@ -218,10 +218,10 @@ platform_properties: ...@@ -218,10 +218,10 @@ platform_properties:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "certs", "version": "version:9563bb"}, {"dependency": "certs", "version": "version:9563bb"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
os: Windows-10 os: Windows-10
device_type: "msm8952" device_type: "msm8952"
...@@ -243,8 +243,8 @@ targets: ...@@ -243,8 +243,8 @@ targets:
test_timeout_secs: "3600" # 1 hour test_timeout_secs: "3600" # 1 hour
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"} {"dependency": "curl", "version": "version:7.64.0"}
] ]
cores: "32" cores: "32"
...@@ -283,9 +283,9 @@ targets: ...@@ -283,9 +283,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "android_virtual_device", "version": "34"}, {"dependency": "android_virtual_device", "version": "34"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["framework","hostonly","linux"] ["framework","hostonly","linux"]
...@@ -297,7 +297,7 @@ targets: ...@@ -297,7 +297,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -316,7 +316,7 @@ targets: ...@@ -316,7 +316,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -335,7 +335,7 @@ targets: ...@@ -335,7 +335,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -424,9 +424,9 @@ targets: ...@@ -424,9 +424,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -444,8 +444,8 @@ targets: ...@@ -444,8 +444,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -476,8 +476,8 @@ targets: ...@@ -476,8 +476,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -507,8 +507,8 @@ targets: ...@@ -507,8 +507,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -586,7 +586,7 @@ targets: ...@@ -586,7 +586,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:17"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: framework_tests shard: framework_tests
...@@ -617,7 +617,7 @@ targets: ...@@ -617,7 +617,7 @@ targets:
{"dependency": "cmake", "version": "build_id:8787856497187628321"}, {"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "ninja", "version": "version:1.9.0"}, {"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "android_sdk", "version": "version:33v6"} {"dependency": "android_sdk", "version": "version:34v3"}
] ]
shard: framework_tests shard: framework_tests
subshard: misc subshard: misc
...@@ -676,9 +676,9 @@ targets: ...@@ -676,9 +676,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -694,9 +694,9 @@ targets: ...@@ -694,9 +694,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -712,9 +712,9 @@ targets: ...@@ -712,9 +712,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -730,9 +730,9 @@ targets: ...@@ -730,9 +730,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -748,9 +748,9 @@ targets: ...@@ -748,9 +748,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -766,9 +766,9 @@ targets: ...@@ -766,9 +766,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -785,8 +785,9 @@ targets: ...@@ -785,8 +785,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"} {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -803,9 +804,9 @@ targets: ...@@ -803,9 +804,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -822,9 +823,9 @@ targets: ...@@ -822,9 +823,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -841,9 +842,9 @@ targets: ...@@ -841,9 +842,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "linux"] ["devicelab", "hostonly", "linux"]
...@@ -939,7 +940,7 @@ targets: ...@@ -939,7 +940,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"} {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}
] ]
tags: > tags: >
...@@ -965,13 +966,13 @@ targets: ...@@ -965,13 +966,13 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"}, {"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "ninja", "version": "version:1.9.0"}, {"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_integration_tests shard: tool_integration_tests
subshard: "1_4" subshard: "1_4"
...@@ -991,13 +992,13 @@ targets: ...@@ -991,13 +992,13 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"}, {"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "ninja", "version": "version:1.9.0"}, {"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_integration_tests shard: tool_integration_tests
subshard: "2_4" subshard: "2_4"
...@@ -1017,13 +1018,13 @@ targets: ...@@ -1017,13 +1018,13 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"}, {"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "ninja", "version": "version:1.9.0"}, {"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_integration_tests shard: tool_integration_tests
subshard: "3_4" subshard: "3_4"
...@@ -1043,13 +1044,13 @@ targets: ...@@ -1043,13 +1044,13 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"}, {"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "cmake", "version": "build_id:8787856497187628321"}, {"dependency": "cmake", "version": "build_id:8787856497187628321"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "ninja", "version": "version:1.9.0"}, {"dependency": "ninja", "version": "version:1.9.0"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_integration_tests shard: tool_integration_tests
subshard: "4_4" subshard: "4_4"
...@@ -1099,8 +1100,8 @@ targets: ...@@ -1099,8 +1100,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: commands subshard: commands
...@@ -1119,8 +1120,8 @@ targets: ...@@ -1119,8 +1120,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: general subshard: general
...@@ -1153,7 +1154,7 @@ targets: ...@@ -1153,7 +1154,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"} {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}
] ]
tags: > tags: >
...@@ -1166,7 +1167,7 @@ targets: ...@@ -1166,7 +1167,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"} {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}
] ]
tags: > tags: >
...@@ -1184,7 +1185,7 @@ targets: ...@@ -1184,7 +1185,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"} {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}
] ]
tags: > tags: >
...@@ -1201,7 +1202,7 @@ targets: ...@@ -1201,7 +1202,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1223,7 +1224,7 @@ targets: ...@@ -1223,7 +1224,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1245,7 +1246,7 @@ targets: ...@@ -1245,7 +1246,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1267,7 +1268,7 @@ targets: ...@@ -1267,7 +1268,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1289,7 +1290,7 @@ targets: ...@@ -1289,7 +1290,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1311,7 +1312,7 @@ targets: ...@@ -1311,7 +1312,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1333,7 +1334,7 @@ targets: ...@@ -1333,7 +1334,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1355,7 +1356,7 @@ targets: ...@@ -1355,7 +1356,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1377,7 +1378,7 @@ targets: ...@@ -1377,7 +1378,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1399,7 +1400,7 @@ targets: ...@@ -1399,7 +1400,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1421,7 +1422,7 @@ targets: ...@@ -1421,7 +1422,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1443,7 +1444,7 @@ targets: ...@@ -1443,7 +1444,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1465,7 +1466,7 @@ targets: ...@@ -1465,7 +1466,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1487,7 +1488,7 @@ targets: ...@@ -1487,7 +1488,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1509,7 +1510,7 @@ targets: ...@@ -1509,7 +1510,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1531,7 +1532,7 @@ targets: ...@@ -1531,7 +1532,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1553,7 +1554,7 @@ targets: ...@@ -1553,7 +1554,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1575,7 +1576,7 @@ targets: ...@@ -1575,7 +1576,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1597,7 +1598,7 @@ targets: ...@@ -1597,7 +1598,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1619,7 +1620,7 @@ targets: ...@@ -1619,7 +1620,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1641,7 +1642,7 @@ targets: ...@@ -1641,7 +1642,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -1663,9 +1664,9 @@ targets: ...@@ -1663,9 +1664,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
shard: web_tool_tests shard: web_tool_tests
...@@ -1921,7 +1922,7 @@ targets: ...@@ -1921,7 +1922,7 @@ targets:
task_name: complex_layout_android__scroll_smoothness task_name: complex_layout_android__scroll_smoothness
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_android complex_layout_scroll_perf__devtools_memory - name: Linux_android complex_layout_scroll_perf__devtools_memory
...@@ -1934,7 +1935,7 @@ targets: ...@@ -1934,7 +1935,7 @@ targets:
task_name: complex_layout_scroll_perf__devtools_memory task_name: complex_layout_scroll_perf__devtools_memory
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_android complex_layout_scroll_perf__memory - name: Linux_android complex_layout_scroll_perf__memory
...@@ -1947,7 +1948,7 @@ targets: ...@@ -1947,7 +1948,7 @@ targets:
task_name: complex_layout_scroll_perf__memory task_name: complex_layout_scroll_perf__memory
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_android complex_layout_scroll_perf__timeline_summary - name: Linux_android complex_layout_scroll_perf__timeline_summary
...@@ -1960,7 +1961,7 @@ targets: ...@@ -1960,7 +1961,7 @@ targets:
task_name: complex_layout_scroll_perf__timeline_summary task_name: complex_layout_scroll_perf__timeline_summary
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_pixel_7pro complex_layout_scroll_perf__timeline_summary - name: Linux_pixel_7pro complex_layout_scroll_perf__timeline_summary
...@@ -1973,7 +1974,7 @@ targets: ...@@ -1973,7 +1974,7 @@ targets:
task_name: complex_layout_scroll_perf__timeline_summary task_name: complex_layout_scroll_perf__timeline_summary
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_pixel_7pro complex_layout_scroll_perf_impeller__timeline_summary - name: Linux_pixel_7pro complex_layout_scroll_perf_impeller__timeline_summary
...@@ -2014,7 +2015,7 @@ targets: ...@@ -2014,7 +2015,7 @@ targets:
task_name: complex_layout_semantics_perf task_name: complex_layout_semantics_perf
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_android complex_layout__start_up - name: Linux_android complex_layout__start_up
...@@ -2027,7 +2028,7 @@ targets: ...@@ -2027,7 +2028,7 @@ targets:
task_name: complex_layout__start_up task_name: complex_layout__start_up
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux_android cubic_bezier_perf__e2e_summary - name: Linux_android cubic_bezier_perf__e2e_summary
...@@ -2740,7 +2741,7 @@ targets: ...@@ -2740,7 +2741,7 @@ targets:
task_name: tiles_scroll_perf__timeline_summary task_name: tiles_scroll_perf__timeline_summary
dependencies: >- dependencies: >-
[ [
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
- name: Linux web_size__compile_test - name: Linux web_size__compile_test
...@@ -3041,7 +3042,7 @@ targets: ...@@ -3041,7 +3042,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
...@@ -3059,7 +3060,7 @@ targets: ...@@ -3059,7 +3060,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
...@@ -3077,7 +3078,7 @@ targets: ...@@ -3077,7 +3078,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
...@@ -3095,7 +3096,7 @@ targets: ...@@ -3095,7 +3096,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
...@@ -3243,7 +3244,7 @@ targets: ...@@ -3243,7 +3244,7 @@ targets:
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "android_sdk", "version": "version:33v6"} {"dependency": "android_sdk", "version": "version:34v3"}
] ]
shard: framework_tests shard: framework_tests
subshard: misc subshard: misc
...@@ -3295,8 +3296,8 @@ targets: ...@@ -3295,8 +3296,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
...@@ -3332,8 +3333,8 @@ targets: ...@@ -3332,8 +3333,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
...@@ -3350,8 +3351,8 @@ targets: ...@@ -3350,8 +3351,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
...@@ -3368,8 +3369,8 @@ targets: ...@@ -3368,8 +3369,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
...@@ -3434,8 +3435,8 @@ targets: ...@@ -3434,8 +3435,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"} {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
] ]
tags: > tags: >
...@@ -3490,8 +3491,8 @@ targets: ...@@ -3490,8 +3491,8 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "mac"] ["devicelab", "hostonly", "mac"]
...@@ -3579,9 +3580,9 @@ targets: ...@@ -3579,9 +3580,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -3603,9 +3604,9 @@ targets: ...@@ -3603,9 +3604,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -3627,9 +3628,9 @@ targets: ...@@ -3627,9 +3628,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -3651,9 +3652,9 @@ targets: ...@@ -3651,9 +3652,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}, {"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
...@@ -3675,8 +3676,8 @@ targets: ...@@ -3675,8 +3676,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: commands subshard: commands
...@@ -3690,8 +3691,8 @@ targets: ...@@ -3690,8 +3691,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: general subshard: general
...@@ -3733,9 +3734,9 @@ targets: ...@@ -3733,9 +3734,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
shard: web_tool_tests shard: web_tool_tests
...@@ -4625,7 +4626,7 @@ targets: ...@@ -4625,7 +4626,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4643,7 +4644,7 @@ targets: ...@@ -4643,7 +4644,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4661,7 +4662,7 @@ targets: ...@@ -4661,7 +4662,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4679,7 +4680,7 @@ targets: ...@@ -4679,7 +4680,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4697,7 +4698,7 @@ targets: ...@@ -4697,7 +4698,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4715,7 +4716,7 @@ targets: ...@@ -4715,7 +4716,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:118.0.5993.70"}, {"dependency": "chrome_and_driver", "version": "version:118.0.5993.70"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
...@@ -4788,7 +4789,7 @@ targets: ...@@ -4788,7 +4789,7 @@ targets:
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"}, {"dependency": "vs_build", "version": "version:vs2019"},
{"dependency": "open_jdk", "version": "version:17"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "android_sdk", "version": "version:33v6"} {"dependency": "android_sdk", "version": "version:34v3"}
] ]
shard: framework_tests shard: framework_tests
subshard: misc subshard: misc
...@@ -4839,9 +4840,9 @@ targets: ...@@ -4839,9 +4840,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -4883,9 +4884,9 @@ targets: ...@@ -4883,9 +4884,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -4902,9 +4903,9 @@ targets: ...@@ -4902,9 +4903,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -4921,9 +4922,9 @@ targets: ...@@ -4921,9 +4922,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -4966,9 +4967,9 @@ targets: ...@@ -4966,9 +4967,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -4985,9 +4986,9 @@ targets: ...@@ -4985,9 +4986,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
tags: > tags: >
["devicelab", "hostonly", "windows"] ["devicelab", "hostonly", "windows"]
...@@ -5112,9 +5113,9 @@ targets: ...@@ -5112,9 +5113,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5136,9 +5137,9 @@ targets: ...@@ -5136,9 +5137,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5160,9 +5161,9 @@ targets: ...@@ -5160,9 +5161,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5184,9 +5185,9 @@ targets: ...@@ -5184,9 +5185,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5208,9 +5209,9 @@ targets: ...@@ -5208,9 +5209,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5232,9 +5233,9 @@ targets: ...@@ -5232,9 +5233,9 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}, {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"},
{"dependency": "vs_build", "version": "version:vs2019"} {"dependency": "vs_build", "version": "version:vs2019"}
] ]
...@@ -5256,8 +5257,8 @@ targets: ...@@ -5256,8 +5257,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: commands subshard: commands
...@@ -5276,8 +5277,8 @@ targets: ...@@ -5276,8 +5277,8 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "open_jdk", "version": "version:11"} {"dependency": "open_jdk", "version": "version:17"}
] ]
shard: tool_tests shard: tool_tests
subshard: general subshard: general
...@@ -5295,9 +5296,9 @@ targets: ...@@ -5295,9 +5296,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
shard: web_tool_tests shard: web_tool_tests
...@@ -5316,9 +5317,9 @@ targets: ...@@ -5316,9 +5317,9 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:33v6"}, {"dependency": "android_sdk", "version": "version:34v3"},
{"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"}, {"dependency": "chrome_and_driver", "version": "version:119.0.6045.9"},
{"dependency": "open_jdk", "version": "version:11"}, {"dependency": "open_jdk", "version": "version:17"},
{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"} {"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
] ]
shard: web_tool_tests shard: web_tool_tests
......
dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart
View file @ 3b370c85
...@@ -261,9 +261,8 @@ Future<void> main() async { ...@@ -261,9 +261,8 @@ Future<void> main() async {
'SampleApp', 'SampleApp',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'debug', 'debug',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
...@@ -333,9 +332,8 @@ Future<void> main() async { ...@@ -333,9 +332,8 @@ Future<void> main() async {
'SampleApp', 'SampleApp',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'release', 'release',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
......
dev/devicelab/bin/tasks/module_test.dart
View file @ 3b370c85
...@@ -362,9 +362,8 @@ exitCode: $exitCode ...@@ -362,9 +362,8 @@ exitCode: $exitCode
'app', 'app',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'debug', 'debug',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
...@@ -452,9 +451,8 @@ exitCode: $exitCode ...@@ -452,9 +451,8 @@ exitCode: $exitCode
'app', 'app',
'build', 'build',
'intermediates', 'intermediates',
'merged_assets', 'assets',
'release', 'release',
'out',
'flutter_assets', 'flutter_assets',
'assets', 'assets',
'read-only.txt', 'read-only.txt',
......
dev/integration_tests/android_custom_host_app/build.gradle
View file @ 3b370c85
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
dev/integration_tests/android_host_app_v2_embedding/build.gradle
View file @ 3b370c85
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle
View file @ 3b370c85
...@@ -8,7 +8,7 @@ buildscript { ...@@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }
......
packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart
View file @ 3b370c85
...@@ -107,14 +107,14 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig { ...@@ -107,14 +107,14 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig {
@override @override
String get androidBuild => r''' String get androidBuild => r'''
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
...@@ -495,6 +495,7 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig { ...@@ -495,6 +495,7 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig {
android:extractNativeLibs="false"> android:extractNativeLibs="false">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
......
packages/flutter_tools/test/integration.shard/test_data/multidex_project.dart
View file @ 3b370c85
...@@ -83,14 +83,14 @@ class MultidexProject extends Project { ...@@ -83,14 +83,14 @@ class MultidexProject extends Project {
String get androidBuild => r''' String get androidBuild => r'''
buildscript { buildscript {
ext.kotlin_version = '1.3.50' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0' classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
...@@ -209,6 +209,7 @@ class MultidexProject extends Project { ...@@ -209,6 +209,7 @@ class MultidexProject extends Project {
android:name="${applicationName}"> android:name="${applicationName}">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab