Skip to content

Commit 36c167b

Browse files
hvadehracopybara-github
hvadehra
authored and
copybara-github
committed
Separate prebuilt darwin java_tools for x86_64 and arm64
This is step 1 of #17780 Closes #17767. PiperOrigin-RevId: 517115807 Change-Id: If2bb85a8a15fd126ab52e5738e3d9558da813090
1 parent f861499 commit 36c167b

File tree

10 files changed

+91
-7
lines changed

10 files changed

+91
-7
lines changed

‎WORKSPACE‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,20 @@ dist_http_archive(
435435
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
436436
)
437437

438+
# Used in src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
439+
dist_http_archive(
440+
name = "remote_java_tools_darwin_x86_64_for_testing",
441+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
442+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
443+
)
444+
445+
# Used in src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
446+
dist_http_archive(
447+
name = "remote_java_tools_darwin_arm64_for_testing",
448+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
449+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
450+
)
451+
438452
# Used in src/test/shell/bazel/testdata/jdk_http_archives.
439453
dist_http_archive(
440454
name = "remote_java_tools_test",
@@ -463,6 +477,20 @@ dist_http_archive(
463477
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
464478
)
465479

480+
# Used in src/test/shell/bazel/testdata/jdk_http_archives.
481+
dist_http_archive(
482+
name = "remote_java_tools_test_darwin_x86_64",
483+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
484+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
485+
)
486+
487+
# Used in src/test/shell/bazel/testdata/jdk_http_archives.
488+
dist_http_archive(
489+
name = "remote_java_tools_test_darwin_arm64",
490+
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
491+
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
492+
)
493+
466494
dist_http_archive(
467495
name = "openjdk11_linux_archive",
468496
build_file_content = """

‎distdir_deps.bzl‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,12 +434,31 @@ DIST_DEPS = {
434434
],
435435
"package_version": "11.12",
436436
},
437-
"remote_java_tools_darwin": {
437+
"remote_java_tools_darwin_x86_64": {
438438
"aliases": [
439+
"remote_java_tools_darwin",
439440
"remote_java_tools_test_darwin",
441+
"remote_java_tools_test_darwin_x86_64",
440442
"remote_java_tools_darwin_for_testing",
443+
"remote_java_tools_darwin_x86_64_for_testing",
441444
],
442-
"archive": "java_tools_darwin-v11.12.zip",
445+
"archive": "java_tools_darwin_x86_64-v11.12.zip",
446+
"sha256": "aed319892b638efabd08405b8f835770e13e2465d20459876c5f457f2b6426f3",
447+
"urls": [
448+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_darwin-v11.12.zip",
449+
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_darwin-v11.12.zip",
450+
],
451+
"used_in": [
452+
"test_WORKSPACE_files",
453+
],
454+
"package_version": "11.12",
455+
},
456+
"remote_java_tools_darwin_arm64": {
457+
"aliases": [
458+
"remote_java_tools_test_darwin_arm64",
459+
"remote_java_tools_darwin_arm64_for_testing",
460+
],
461+
"archive": "java_tools_darwin_arm64-v11.12.zip",
443462
"sha256": "aed319892b638efabd08405b8f835770e13e2465d20459876c5f457f2b6426f3",
444463
"urls": [
445464
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_darwin-v11.12.zip",

‎src/BUILD‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,14 @@ filegroup(
566566
"@com_google_protobuf//:WORKSPACE",
567567
"@remote_coverage_tools//:WORKSPACE",
568568
"@remote_java_tools_darwin_for_testing//:WORKSPACE",
569+
"@remote_java_tools_darwin_x86_64_for_testing//:WORKSPACE",
570+
"@remote_java_tools_darwin_arm64_for_testing//:WORKSPACE",
569571
"@remote_java_tools_for_testing//:WORKSPACE",
570572
"@remote_java_tools_linux_for_testing//:WORKSPACE",
571573
"@remote_java_tools_test//:WORKSPACE",
572574
"@remote_java_tools_test_darwin//:WORKSPACE",
575+
"@remote_java_tools_test_darwin_x86_64//:WORKSPACE",
576+
"@remote_java_tools_test_darwin_arm64//:WORKSPACE",
573577
"@remote_java_tools_test_linux//:WORKSPACE",
574578
"@remote_java_tools_test_windows//:WORKSPACE",
575579
"@remote_java_tools_windows_for_testing//:WORKSPACE",

‎src/main/java/com/google/devtools/build/lib/bazel/rules/java/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ gen_workspace_stanza(
9393
"remote_java_tools_linux",
9494
"remote_java_tools_windows",
9595
"remote_java_tools_darwin",
96+
"remote_java_tools_darwin_x86_64",
97+
"remote_java_tools_darwin_arm64",
9698
"rules_cc",
9799
"rules_java",
98100
"rules_proto",

‎src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.tmpl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,16 @@ maybe(
267267
{remote_java_tools_darwin}
268268
)
269269

270+
maybe(
271+
http_archive,
272+
{remote_java_tools_darwin_x86_64}
273+
)
274+
275+
maybe(
276+
http_archive,
277+
{remote_java_tools_darwin_arm64}
278+
)
279+
270280
maybe(
271281
http_archive,
272282
{rules_java}

‎src/test/py/bazel/test_base.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ class TestBase(unittest.TestCase):
8080
'remotejdk19_win_for_testing',
8181
'remote_java_tools_for_testing',
8282
'remote_java_tools_darwin_for_testing',
83+
'remote_java_tools_darwin_x86_64_for_testing',
84+
'remote_java_tools_darwin_arm64_for_testing',
8385
'remote_java_tools_linux_for_testing',
8486
'remote_java_tools_windows_for_testing',
8587
'remote_coverage_tools',

‎src/test/shell/bazel/testdata/BUILD‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ gen_workspace_stanza(
5050
"remote_java_tools_test_linux",
5151
"remote_java_tools_test_windows",
5252
"remote_java_tools_test_darwin",
53+
"remote_java_tools_test_darwin_x86_64",
54+
"remote_java_tools_test_darwin_arm64",
5355
"openjdk11_linux_archive",
5456
"openjdk11_linux_s390x_archive",
5557
"openjdk11_darwin_archive",

‎src/test/shell/bazel/testdata/jdk_http_archives.tmpl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ http_archive(
1515
{remote_java_tools_test_darwin}
1616
)
1717

18+
http_archive(
19+
{remote_java_tools_test_darwin_x86_64}
20+
)
21+
22+
http_archive(
23+
{remote_java_tools_test_darwin_arm64}
24+
)
25+
1826
#################################### JDK 11 ####################################
1927
# This must be kept in sync with the top-level WORKSPACE file.
2028
http_archive(

‎src/test/shell/testenv.sh.tmpl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,12 @@ EOF
296296
"remote_coverage_tools"
297297
"remote_java_tools_for_testing"
298298
"remote_java_tools_darwin_for_testing"
299+
"remote_java_tools_darwin_x86_64_for_testing"
300+
"remote_java_tools_darwin_arm64_for_testing"
299301
"remote_java_tools_test"
300302
"remote_java_tools_test_darwin"
303+
"remote_java_tools_test_darwin_x86_64"
304+
"remote_java_tools_test_darwin_arm64"
301305
"remote_java_tools_test_linux"
302306
"remote_java_tools_test_windows"
303307
"remote_java_tools_linux_for_testing"

‎tools/jdk/BUILD.tools‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ cc_library(
131131
)
132132
for OS in [
133133
"linux",
134-
"darwin",
134+
"darwin_x86_64",
135+
"darwin_arm64",
135136
"windows",
136137
]
137138
]
@@ -148,7 +149,8 @@ alias(
148149
name = "ijar_prebuilt_binary_or_cc_binary",
149150
actual = select({
150151
"//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
151-
"//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
152+
"//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
153+
"//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
152154
"//src/conditions:windows": ":ijar_prebuilt_binary_windows",
153155
"//conditions:default": "@remote_java_tools//:ijar_cc_binary",
154156
}),
@@ -158,7 +160,8 @@ alias(
158160
name = "ijar_prebuilt_binary",
159161
actual = select({
160162
"//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
161-
"//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
163+
"//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
164+
"//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
162165
"//src/conditions:windows": ":ijar_prebuilt_binary_windows",
163166
}),
164167
)
@@ -178,7 +181,8 @@ alias(
178181
name = "singlejar_prebuilt_or_cc_binary",
179182
actual = select({
180183
"//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
181-
"//src/conditions:darwin": ":prebuilt_singlejar_darwin",
184+
"//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
185+
"//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
182186
"//src/conditions:windows": ":prebuilt_singlejar_windows",
183187
"//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
184188
}),
@@ -188,7 +192,8 @@ alias(
188192
name = "prebuilt_singlejar",
189193
actual = select({
190194
"//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
191-
"//src/conditions:darwin": ":prebuilt_singlejar_darwin",
195+
"//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
196+
"//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
192197
"//src/conditions:windows": ":prebuilt_singlejar_windows",
193198
}),
194199
)

0 commit comments

Comments
 (0)