Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit bf538a0

Browse files
reidbakerreidbaker
authored
Set download_jdk variable (#54584)
Follow up from #54450 (comment)
1 parent 0308ff4 commit bf538a0

20 files changed

+195
-52
lines changed

‎.ci.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ targets:
150150
gclient_variables: >-
151151
{
152152
"download_emsdk": "true",
153-
"download_android_deps": "true"
153+
"download_android_deps": "true",
154+
"download_jdk": "true"
154155
}
155156
timeout: 60
156157

@@ -168,7 +169,8 @@ targets:
168169
]
169170
gclient_variables: >-
170171
{
171-
"download_android_deps": "true"
172+
"download_android_deps": "true",
173+
"download_jdk": "true"
172174
}
173175
timeout: 60
174176

@@ -191,7 +193,8 @@ targets:
191193
]
192194
gclient_variables: >-
193195
{
194-
"download_android_deps": "true"
196+
"download_android_deps": "true",
197+
"download_jdk": "true"
195198
}
196199
timeout: 60
197200

‎DEPS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@ vars = {
9090
# Checkout Android dependencies only on platforms where we build for Android targets.
9191
'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
9292

93+
# Checkout Java dependencies only on platforms that do not have java installed on path.
94+
'download_jdk': True,
95+
9396
# Checkout Windows dependencies only if we are building on Windows.
9497
'download_windows_deps' : 'host_os == "win"',
9598

‎ci/builders/linux_arm_host_engine.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
],
1919
"gclient_variables": {
2020
"download_android_deps": false,
21+
"download_jdk": false,
2122
"use_rbe": true
2223
},
2324
"gn": [
@@ -62,6 +63,7 @@
6263
],
6364
"gclient_variables": {
6465
"download_android_deps": false,
66+
"download_jdk": false,
6567
"use_rbe": true
6668
},
6769
"gn": [
@@ -105,6 +107,7 @@
105107
],
106108
"gclient_variables": {
107109
"download_android_deps": false,
110+
"download_jdk": false,
108111
"use_rbe": true
109112
},
110113
"gn": [

‎ci/builders/linux_clang_tidy.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@
6161
"cores=32"
6262
],
6363
"gclient_variables": {
64-
"download_android_deps": false
64+
"download_android_deps": false,
65+
"download_jdk": false
6566
},
6667
"dependencies": [
6768
"ci/host_debug_clang_tidy"
@@ -90,7 +91,8 @@
9091
"cores=32"
9192
],
9293
"gclient_variables": {
93-
"download_android_deps": false
94+
"download_android_deps": false,
95+
"download_jdk": false
9496
},
9597
"dependencies": [
9698
"ci/host_debug_clang_tidy"
@@ -119,7 +121,8 @@
119121
"cores=32"
120122
],
121123
"gclient_variables": {
122-
"download_android_deps": false
124+
"download_android_deps": false,
125+
"download_jdk": false
123126
},
124127
"dependencies": [
125128
"ci/host_debug_clang_tidy"
@@ -148,7 +151,8 @@
148151
"cores=32"
149152
],
150153
"gclient_variables": {
151-
"download_android_deps": false
154+
"download_android_deps": false,
155+
"download_jdk": false
152156
},
153157
"dependencies": [
154158
"ci/host_debug_clang_tidy"

‎ci/builders/linux_fuchsia.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
],
88
"gclient_variables": {
99
"download_android_deps": false,
10+
"download_jdk": false,
1011
"use_rbe": true
1112
},
1213
"gn": [
@@ -36,6 +37,7 @@
3637
],
3738
"gclient_variables": {
3839
"download_android_deps": false,
40+
"download_jdk": false,
3941
"use_rbe": true
4042
},
4143
"gn": [
@@ -65,6 +67,7 @@
6567
],
6668
"gclient_variables": {
6769
"download_android_deps": false,
70+
"download_jdk": false,
6871
"use_rbe": true
6972
},
7073
"gn": [
@@ -110,6 +113,7 @@
110113
],
111114
"gclient_variables": {
112115
"download_android_deps": false,
116+
"download_jdk": false,
113117
"use_rbe": true
114118
},
115119
"gn": [
@@ -139,6 +143,7 @@
139143
],
140144
"gclient_variables": {
141145
"download_android_deps": false,
146+
"download_jdk": false,
142147
"run_fuchsia_emu": true,
143148
"use_rbe": true
144149
},
@@ -169,6 +174,7 @@
169174
],
170175
"gclient_variables": {
171176
"download_android_deps": false,
177+
"download_jdk": false,
172178
"run_fuchsia_emu": true,
173179
"use_rbe": true
174180
},

‎ci/builders/linux_host_desktop_engine.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
],
1919
"gclient_variables": {
2020
"download_android_deps": false,
21+
"download_jdk": false,
2122
"use_rbe": true
2223
},
2324
"gn": [
@@ -57,6 +58,7 @@
5758
],
5859
"gclient_variables": {
5960
"download_android_deps": false,
61+
"download_jdk": false,
6062
"use_rbe": true
6163
},
6264
"gn": [
@@ -97,6 +99,7 @@
9799
],
98100
"gclient_variables": {
99101
"download_android_deps": false,
102+
"download_jdk": false,
100103
"use_rbe": true
101104
},
102105
"gn": [

‎ci/builders/linux_host_engine.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
],
2323
"gclient_variables": {
2424
"download_android_deps": false,
25+
"download_jdk": false,
2526
"use_rbe": true
2627
},
2728
"gn": [
@@ -78,6 +79,7 @@
7879
],
7980
"gclient_variables": {
8081
"download_android_deps": false,
82+
"download_jdk": false,
8183
"use_rbe": true
8284
},
8385
"gn": [
@@ -141,6 +143,7 @@
141143
],
142144
"gclient_variables": {
143145
"download_android_deps": false,
146+
"download_jdk": false,
144147
"use_rbe": true
145148
},
146149
"gn": [

‎ci/builders/linux_unopt.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
],
115115
"gclient_variables": {
116116
"download_android_deps": false,
117+
"download_jdk": false,
117118
"use_rbe": true
118119
},
119120
"gn": [

0 commit comments

Comments
 (0)