diff --git a/DEPS b/DEPS index 63a4fff096..9ac532b41c 100644 --- a/DEPS +++ b/DEPS @@ -90,6 +90,9 @@ vars = { # Checkout Android dependencies only on platforms where we build for Android targets. 'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")', + # Checkout Java dependencies only on platforms that do not have java installed on path. + 'download_jdk': True, + # Checkout Windows dependencies only if we are building on Windows. 'download_windows_deps' : 'host_os == "win"', diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml index ebeab8d19e..303d4d253f 100644 --- a/engine/src/flutter/.ci.yaml +++ b/engine/src/flutter/.ci.yaml @@ -150,7 +150,8 @@ targets: gclient_variables: >- { "download_emsdk": "true", - "download_android_deps": "true" + "download_android_deps": "true", + "download_jdk": "true" } timeout: 60 @@ -168,7 +169,8 @@ targets: ] gclient_variables: >- { - "download_android_deps": "true" + "download_android_deps": "true", + "download_jdk": "true" } timeout: 60 @@ -191,7 +193,8 @@ targets: ] gclient_variables: >- { - "download_android_deps": "true" + "download_android_deps": "true", + "download_jdk": "true" } timeout: 60 diff --git a/engine/src/flutter/ci/builders/linux_arm_host_engine.json b/engine/src/flutter/ci/builders/linux_arm_host_engine.json index 289a8d201e..e5890f95d3 100644 --- a/engine/src/flutter/ci/builders/linux_arm_host_engine.json +++ b/engine/src/flutter/ci/builders/linux_arm_host_engine.json @@ -18,6 +18,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -62,6 +63,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -105,6 +107,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/linux_clang_tidy.json b/engine/src/flutter/ci/builders/linux_clang_tidy.json index a9803463e8..78908ad8ae 100644 --- a/engine/src/flutter/ci/builders/linux_clang_tidy.json +++ b/engine/src/flutter/ci/builders/linux_clang_tidy.json @@ -61,7 +61,8 @@ "cores=32" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "ci/host_debug_clang_tidy" @@ -90,7 +91,8 @@ "cores=32" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "ci/host_debug_clang_tidy" @@ -119,7 +121,8 @@ "cores=32" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "ci/host_debug_clang_tidy" @@ -148,7 +151,8 @@ "cores=32" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "ci/host_debug_clang_tidy" diff --git a/engine/src/flutter/ci/builders/linux_fuchsia.json b/engine/src/flutter/ci/builders/linux_fuchsia.json index 74650d8186..8ed7e08f63 100644 --- a/engine/src/flutter/ci/builders/linux_fuchsia.json +++ b/engine/src/flutter/ci/builders/linux_fuchsia.json @@ -7,6 +7,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -36,6 +37,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -65,6 +67,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -110,6 +113,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -139,6 +143,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "run_fuchsia_emu": true, "use_rbe": true }, @@ -169,6 +174,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "run_fuchsia_emu": true, "use_rbe": true }, diff --git a/engine/src/flutter/ci/builders/linux_host_desktop_engine.json b/engine/src/flutter/ci/builders/linux_host_desktop_engine.json index c0d05b3e80..97e2c3d358 100644 --- a/engine/src/flutter/ci/builders/linux_host_desktop_engine.json +++ b/engine/src/flutter/ci/builders/linux_host_desktop_engine.json @@ -18,6 +18,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -57,6 +58,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -97,6 +99,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/linux_host_engine.json b/engine/src/flutter/ci/builders/linux_host_engine.json index e89a80f114..2c2644e49b 100644 --- a/engine/src/flutter/ci/builders/linux_host_engine.json +++ b/engine/src/flutter/ci/builders/linux_host_engine.json @@ -22,6 +22,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -78,6 +79,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -141,6 +143,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/linux_unopt.json b/engine/src/flutter/ci/builders/linux_unopt.json index f5f8b191d5..855468ab5c 100644 --- a/engine/src/flutter/ci/builders/linux_unopt.json +++ b/engine/src/flutter/ci/builders/linux_unopt.json @@ -114,6 +114,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/linux_web_engine.json b/engine/src/flutter/ci/builders/linux_web_engine.json index 19b09660cf..7c350e1250 100644 --- a/engine/src/flutter/ci/builders/linux_web_engine.json +++ b/engine/src/flutter/ci/builders/linux_web_engine.json @@ -11,6 +11,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "download_emsdk": true }, "gn": [ @@ -342,7 +343,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -378,7 +380,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -414,7 +417,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -450,7 +454,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -486,7 +491,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -522,7 +528,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -558,7 +565,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -594,7 +602,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -630,7 +639,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -666,7 +676,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -702,7 +713,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -738,7 +750,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -774,7 +787,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -810,7 +824,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -846,7 +861,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -882,7 +898,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -918,7 +935,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -954,7 +972,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -990,7 +1009,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1026,7 +1046,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1062,7 +1083,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1098,7 +1120,8 @@ "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1135,7 +1158,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1168,7 +1192,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1201,7 +1226,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1234,7 +1260,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1267,7 +1294,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1300,7 +1328,8 @@ "cpu=arm64" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1332,7 +1361,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1368,7 +1398,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1404,7 +1435,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1440,7 +1472,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1476,7 +1509,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1512,7 +1546,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1548,7 +1583,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1584,7 +1620,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1620,7 +1657,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1656,7 +1694,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1692,7 +1731,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1728,7 +1768,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1764,7 +1805,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1800,7 +1842,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1836,7 +1879,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1872,7 +1916,8 @@ "os=Windows" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "download_jdk": false }, "dependencies": [ "web_tests/artifacts", @@ -1901,4 +1946,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/engine/src/flutter/ci/builders/local_engine.json b/engine/src/flutter/ci/builders/local_engine.json index 9fb0f6ae57..e675ba7a69 100644 --- a/engine/src/flutter/ci/builders/local_engine.json +++ b/engine/src/flutter/ci/builders/local_engine.json @@ -8,6 +8,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -40,6 +41,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -73,6 +75,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -105,6 +108,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -137,6 +141,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -170,6 +175,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -516,6 +522,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -547,6 +554,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -579,6 +587,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -611,6 +620,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -643,6 +653,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -668,6 +679,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -694,6 +706,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -719,6 +732,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -745,6 +759,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -776,6 +791,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -801,6 +817,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -826,6 +843,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -857,6 +875,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -883,6 +902,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_android_aot_engine.json b/engine/src/flutter/ci/builders/mac_android_aot_engine.json index 3308ae4782..a773e1df31 100644 --- a/engine/src/flutter/ci/builders/mac_android_aot_engine.json +++ b/engine/src/flutter/ci/builders/mac_android_aot_engine.json @@ -19,6 +19,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -76,6 +77,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -135,6 +137,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -194,6 +197,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -251,6 +255,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -310,6 +315,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_clang_tidy.json b/engine/src/flutter/ci/builders/mac_clang_tidy.json index b88edcfdd4..46ce63796a 100644 --- a/engine/src/flutter/ci/builders/mac_clang_tidy.json +++ b/engine/src/flutter/ci/builders/mac_clang_tidy.json @@ -8,6 +8,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -35,6 +36,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -67,6 +69,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ @@ -116,6 +119,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ @@ -165,6 +169,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ @@ -214,6 +219,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ @@ -263,6 +269,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json index f80e5f5982..35ebce84a4 100644 --- a/engine/src/flutter/ci/builders/mac_host_engine.json +++ b/engine/src/flutter/ci/builders/mac_host_engine.json @@ -18,6 +18,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -82,6 +83,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -135,6 +137,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -198,6 +201,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -247,6 +251,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -296,6 +301,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -357,6 +363,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -409,6 +416,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -460,6 +468,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -523,6 +532,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -577,6 +587,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -631,6 +642,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -695,6 +707,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -748,6 +761,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -801,6 +815,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -866,6 +881,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -922,6 +938,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -977,6 +994,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json b/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json index c43917f9ef..5660c92bab 100644 --- a/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json +++ b/engine/src/flutter/ci/builders/mac_impeller_cmake_example.json @@ -12,6 +12,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "download_impeller_cmake_example": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json index 3efefb9dd4..2a38ef440c 100644 --- a/engine/src/flutter/ci/builders/mac_ios_engine.json +++ b/engine/src/flutter/ci/builders/mac_ios_engine.json @@ -7,6 +7,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -52,6 +53,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -99,6 +101,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -144,6 +147,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -189,6 +193,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -234,6 +239,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -281,6 +287,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -330,6 +337,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -377,6 +385,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -424,6 +433,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/mac_unopt.json b/engine/src/flutter/ci/builders/mac_unopt.json index 56cf4c4f82..3a95e217f5 100644 --- a/engine/src/flutter/ci/builders/mac_unopt.json +++ b/engine/src/flutter/ci/builders/mac_unopt.json @@ -10,6 +10,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -344,6 +345,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json b/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json index 45a074a640..9afed62f1d 100644 --- a/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json +++ b/engine/src/flutter/ci/builders/standalone/linux_benchmarks.json @@ -5,6 +5,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ diff --git a/engine/src/flutter/ci/builders/standalone/windows_unopt.json b/engine/src/flutter/ci/builders/standalone/windows_unopt.json index 1d6cce407c..20cb49b1f2 100644 --- a/engine/src/flutter/ci/builders/standalone/windows_unopt.json +++ b/engine/src/flutter/ci/builders/standalone/windows_unopt.json @@ -5,6 +5,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "dependencies": [ diff --git a/engine/src/flutter/ci/builders/windows_arm_host_engine.json b/engine/src/flutter/ci/builders/windows_arm_host_engine.json index d4d8d96f4b..291ca05122 100644 --- a/engine/src/flutter/ci/builders/windows_arm_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_arm_host_engine.json @@ -23,6 +23,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -68,6 +69,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -110,6 +112,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "generators": {}, diff --git a/engine/src/flutter/ci/builders/windows_host_engine.json b/engine/src/flutter/ci/builders/windows_host_engine.json index 362f430f1a..f5bc93dc6e 100644 --- a/engine/src/flutter/ci/builders/windows_host_engine.json +++ b/engine/src/flutter/ci/builders/windows_host_engine.json @@ -23,6 +23,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -80,6 +81,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "gn": [ @@ -120,6 +122,7 @@ ], "gclient_variables": { "download_android_deps": false, + "download_jdk": false, "use_rbe": true }, "generators": {},