Skip to content

Commit

Permalink
Explicitly state that embedding macOS OpenJDK is for x86_64
Browse files Browse the repository at this point in the history
This allows adding additional macOS OpenJDK that targets arm64 arch
later.

Closes #12620.

PiperOrigin-RevId: 346138763
  • Loading branch information
thii authored and philwo committed Apr 20, 2021
1 parent 270f00d commit 8e56b94
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -389,21 +389,21 @@ http_file(
)

http_file(
name = "openjdk_macos",
name = "openjdk_macos_x86_64",
downloaded_file_path = "zulu-macos.tar.gz",
sha256 = "8e283cfd23c7555be8e17295ed76eb8f00324c88ab904b8de37bbe08f90e569b",
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-allmodules-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689066.tar.gz"],
)

http_file(
name = "openjdk_macos_vanilla",
name = "openjdk_macos_x86_64_vanilla",
downloaded_file_path = "zulu-macos-vanilla.tar.gz",
sha256 = "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz"],
)

http_file(
name = "openjdk_macos_minimal",
name = "openjdk_macos_x86_64_minimal",
downloaded_file_path = "zulu-macos-minimal.tar.gz",
sha256 = "1bacb1c07035d4066d79f0b65b4ea0ebd1954f3662bdfe3618da382ac8fd23a6",
urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-macosx_x64-minimal-b23d4e05466f2aa1fdcd72d3d3a8e962206b64bf-1581689063.tar.gz"],
Expand Down
14 changes: 7 additions & 7 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ rule_size_test(
filegroup(
name = "embedded_jdk_allmodules_cached",
srcs = select({
"//src/conditions:darwin": [
"@openjdk_macos//file",
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64//file",
],
"//src/conditions:darwin_arm64": [
"@openjdk_macos_aarch64//file",
Expand All @@ -198,8 +198,8 @@ filegroup(
filegroup(
name = "embedded_jdk_minimal_cached",
srcs = select({
"//src/conditions:darwin": [
"@openjdk_macos_minimal//file",
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64_minimal//file",
],
"//src/conditions:darwin_arm64": [
"@openjdk_macos_aarch64_minimal//file",
Expand All @@ -220,8 +220,8 @@ filegroup(
filegroup(
name = "embedded_jdk_vanilla",
srcs = select({
"//src/conditions:darwin": [
"@openjdk_macos_vanilla//file",
"//src/conditions:darwin_x86_64": [
"@openjdk_macos_x86_64_vanilla//file",
],
"//src/conditions:darwin_arm64": [
"@openjdk_macos_aarch64_vanilla//file",
Expand Down Expand Up @@ -772,7 +772,7 @@ filegroup(
"@openjdk15_windows_archive//:WORKSPACE",
"@openjdk_linux_aarch64_minimal//file",
"@openjdk_linux_minimal//file",
"@openjdk_macos_minimal//file",
"@openjdk_macos_x86_64_minimal//file",
"@openjdk_macos_aarch64_minimal//file",
"@openjdk_win_minimal//file",
"@remote_coverage_tools_for_testing//:WORKSPACE",
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/testenv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ EOF
"openjdk15_windows_archive"
"openjdk_linux_aarch64_minimal"
"openjdk_linux_minimal"
"openjdk_macos_minimal"
"openjdk_macos_x86_64_minimal"
"openjdk_macos_aarch64_minimal"
"openjdk_win_minimal"
"remote_coverage_tools_for_testing"
Expand Down

0 comments on commit 8e56b94

Please sign in to comment.