Unverified Commit 126ee23a authored by godofredoc's avatar godofredoc Committed by GitHub

Revert "Use unified android sdk+ndk package in ci.yaml" (#95196)

parent 2f80384a
...@@ -42,7 +42,7 @@ platform_properties: ...@@ -42,7 +42,7 @@ platform_properties:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "curl"}, {"dependency": "curl"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -81,7 +81,7 @@ platform_properties: ...@@ -81,7 +81,7 @@ platform_properties:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -163,7 +163,7 @@ platform_properties: ...@@ -163,7 +163,7 @@ platform_properties:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "certs"}, {"dependency": "certs"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
...@@ -193,7 +193,7 @@ targets: ...@@ -193,7 +193,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -212,7 +212,7 @@ targets: ...@@ -212,7 +212,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -232,7 +232,7 @@ targets: ...@@ -232,7 +232,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -317,7 +317,7 @@ targets: ...@@ -317,7 +317,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"} {"dependency": "android_sdk", "version": "version:29.0"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -330,7 +330,7 @@ targets: ...@@ -330,7 +330,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"} {"dependency": "android_sdk", "version": "version:29.0"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -343,7 +343,7 @@ targets: ...@@ -343,7 +343,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"} {"dependency": "android_sdk", "version": "version:29.0"}
] ]
tags: > tags: >
["firebaselab"] ["firebaselab"]
...@@ -466,7 +466,7 @@ targets: ...@@ -466,7 +466,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -488,7 +488,7 @@ targets: ...@@ -488,7 +488,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -510,7 +510,7 @@ targets: ...@@ -510,7 +510,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -532,7 +532,7 @@ targets: ...@@ -532,7 +532,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -554,7 +554,7 @@ targets: ...@@ -554,7 +554,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -576,7 +576,7 @@ targets: ...@@ -576,7 +576,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -599,7 +599,7 @@ targets: ...@@ -599,7 +599,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -622,7 +622,7 @@ targets: ...@@ -622,7 +622,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -645,7 +645,7 @@ targets: ...@@ -645,7 +645,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -668,7 +668,7 @@ targets: ...@@ -668,7 +668,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -711,7 +711,7 @@ targets: ...@@ -711,7 +711,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -738,7 +738,7 @@ targets: ...@@ -738,7 +738,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
...@@ -763,7 +763,7 @@ targets: ...@@ -763,7 +763,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
...@@ -788,7 +788,7 @@ targets: ...@@ -788,7 +788,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
...@@ -813,7 +813,7 @@ targets: ...@@ -813,7 +813,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "clang"}, {"dependency": "clang"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
...@@ -838,7 +838,7 @@ targets: ...@@ -838,7 +838,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -859,7 +859,7 @@ targets: ...@@ -859,7 +859,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -884,7 +884,7 @@ targets: ...@@ -884,7 +884,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -902,7 +902,7 @@ targets: ...@@ -902,7 +902,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"} {"dependency": "chrome_and_driver", "version": "version:84"}
] ]
tags: > tags: >
...@@ -920,7 +920,7 @@ targets: ...@@ -920,7 +920,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -941,7 +941,7 @@ targets: ...@@ -941,7 +941,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -962,7 +962,7 @@ targets: ...@@ -962,7 +962,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -983,7 +983,7 @@ targets: ...@@ -983,7 +983,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1004,7 +1004,7 @@ targets: ...@@ -1004,7 +1004,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1025,7 +1025,7 @@ targets: ...@@ -1025,7 +1025,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1046,7 +1046,7 @@ targets: ...@@ -1046,7 +1046,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1067,7 +1067,7 @@ targets: ...@@ -1067,7 +1067,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1088,7 +1088,7 @@ targets: ...@@ -1088,7 +1088,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1109,7 +1109,7 @@ targets: ...@@ -1109,7 +1109,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1130,7 +1130,7 @@ targets: ...@@ -1130,7 +1130,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1151,7 +1151,7 @@ targets: ...@@ -1151,7 +1151,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1172,7 +1172,7 @@ targets: ...@@ -1172,7 +1172,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
] ]
...@@ -1353,7 +1353,7 @@ targets: ...@@ -1353,7 +1353,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
...@@ -1838,7 +1838,7 @@ targets: ...@@ -1838,7 +1838,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "android_virtual_device", "version": "31"} {"dependency": "android_virtual_device", "version": "31"}
] ]
tags: > tags: >
...@@ -1851,7 +1851,7 @@ targets: ...@@ -1851,7 +1851,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "android_virtual_device", "version": "31"}, {"dependency": "android_virtual_device", "version": "31"},
{"dependency": "curl"} {"dependency": "curl"}
] ]
...@@ -1921,7 +1921,7 @@ targets: ...@@ -1921,7 +1921,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "gems"}, {"dependency": "gems"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"} {"dependency": "xcode"}
...@@ -1946,7 +1946,7 @@ targets: ...@@ -1946,7 +1946,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -1968,7 +1968,7 @@ targets: ...@@ -1968,7 +1968,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -1988,7 +1988,7 @@ targets: ...@@ -1988,7 +1988,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2008,7 +2008,7 @@ targets: ...@@ -2008,7 +2008,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2028,7 +2028,7 @@ targets: ...@@ -2028,7 +2028,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2167,7 +2167,7 @@ targets: ...@@ -2167,7 +2167,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2191,7 +2191,7 @@ targets: ...@@ -2191,7 +2191,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2215,7 +2215,7 @@ targets: ...@@ -2215,7 +2215,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2239,7 +2239,7 @@ targets: ...@@ -2239,7 +2239,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2264,7 +2264,7 @@ targets: ...@@ -2264,7 +2264,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2289,7 +2289,7 @@ targets: ...@@ -2289,7 +2289,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2315,7 +2315,7 @@ targets: ...@@ -2315,7 +2315,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2340,7 +2340,7 @@ targets: ...@@ -2340,7 +2340,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2365,7 +2365,7 @@ targets: ...@@ -2365,7 +2365,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2391,7 +2391,7 @@ targets: ...@@ -2391,7 +2391,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
{"dependency": "gems"} {"dependency": "gems"}
...@@ -2438,7 +2438,7 @@ targets: ...@@ -2438,7 +2438,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2463,7 +2463,7 @@ targets: ...@@ -2463,7 +2463,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2488,7 +2488,7 @@ targets: ...@@ -2488,7 +2488,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2513,7 +2513,7 @@ targets: ...@@ -2513,7 +2513,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -2538,7 +2538,7 @@ targets: ...@@ -2538,7 +2538,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -2554,7 +2554,7 @@ targets: ...@@ -2554,7 +2554,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -2592,7 +2592,7 @@ targets: ...@@ -2592,7 +2592,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "xcode"}, {"dependency": "xcode"},
...@@ -3530,7 +3530,7 @@ targets: ...@@ -3530,7 +3530,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3551,7 +3551,7 @@ targets: ...@@ -3551,7 +3551,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3570,7 +3570,7 @@ targets: ...@@ -3570,7 +3570,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3589,7 +3589,7 @@ targets: ...@@ -3589,7 +3589,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3703,7 +3703,7 @@ targets: ...@@ -3703,7 +3703,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3727,7 +3727,7 @@ targets: ...@@ -3727,7 +3727,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3746,7 +3746,7 @@ targets: ...@@ -3746,7 +3746,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3783,7 +3783,7 @@ targets: ...@@ -3783,7 +3783,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3807,7 +3807,7 @@ targets: ...@@ -3807,7 +3807,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3831,7 +3831,7 @@ targets: ...@@ -3831,7 +3831,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3855,7 +3855,7 @@ targets: ...@@ -3855,7 +3855,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3879,7 +3879,7 @@ targets: ...@@ -3879,7 +3879,7 @@ targets:
] ]
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
...@@ -3900,7 +3900,7 @@ targets: ...@@ -3900,7 +3900,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3924,7 +3924,7 @@ targets: ...@@ -3924,7 +3924,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3948,7 +3948,7 @@ targets: ...@@ -3948,7 +3948,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3972,7 +3972,7 @@ targets: ...@@ -3972,7 +3972,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -3996,7 +3996,7 @@ targets: ...@@ -3996,7 +3996,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"}, {"dependency": "goldctl"},
...@@ -4020,7 +4020,7 @@ targets: ...@@ -4020,7 +4020,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -4041,7 +4041,7 @@ targets: ...@@ -4041,7 +4041,7 @@ targets:
add_recipes_cq: "true" add_recipes_cq: "true"
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "open_jdk"} {"dependency": "open_jdk"}
] ]
shard: tool_tests shard: tool_tests
...@@ -4061,7 +4061,7 @@ targets: ...@@ -4061,7 +4061,7 @@ targets:
properties: properties:
dependencies: >- dependencies: >-
[ [
{"dependency": "android_sdk", "version": "version:31v8"}, {"dependency": "android_sdk", "version": "version:29.0"},
{"dependency": "chrome_and_driver", "version": "version:84"}, {"dependency": "chrome_and_driver", "version": "version:84"},
{"dependency": "open_jdk"}, {"dependency": "open_jdk"},
{"dependency": "goldctl"} {"dependency": "goldctl"}
......
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