Add aarch64 embedded JDK config, MacOS mock toolchain settings

Hi,

This PR is for additional work to get the tests running correctly on Aarch64. One key issue was that the default embedded jvm used by default was X86_64 and does not work on other architectures.
To support this I have added a new constraint, however I will refine this in case a version of Darwin becomes available on aarch64.

I'll do the work to find a good arm32 toolchain in a future CL. I do not have access for ppc or z390 to repair those architectures.

Either way, hope this is good for you.

Closes #5525.

PiperOrigin-RevId: 206717726

5 files changed, 30 insertions, 0 deletions

diff --git a/WORKSPACE b/WORKSPACE
index 9d6dc54da0..5ec64d17e6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -139,6 +139,17 @@ http_file(
     ],
 )
 
+# The source-code for this OpenJDK can be found at:
+# https://openjdk.linaro.org/releases/jdk9-src-1708.tar.xz
+http_file(
+    name = "openjdk_linux_aarch64",
+    sha256 = "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022",
+    urls = [
+        # When you update this, also update the link to the source-code above.
+        "http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz",
+    ],
+)
+
 http_archive(
   name = "bazel_toolchains",
   urls = [
diff --git a/src/BUILD b/src/BUILD
index ae5db6ee83..95793d93f2 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -205,6 +205,9 @@ filegroup(
         "//src/conditions:windows": [
             "@openjdk_win//file",
         ],
+        "//src/conditions:linux_aarch64": [
+            "@openjdk_linux_aarch64//file",
+        ],
         "//conditions:default": [
             "@openjdk_linux//file",
         ],
diff --git a/src/conditions/BUILD b/src/conditions/BUILD
index 11d0cbfb17..2b28e28057 100644
--- a/src/conditions/BUILD
+++ b/src/conditions/BUILD
@@ -53,6 +53,12 @@ config_setting(
 )
 
 config_setting(
+    name = "linux_aarch64",
+    values = {"cpu": "aarch64"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
     name = "remote",
     values = {"define": "EXECUTOR=remote"},
     visibility = ["//visibility:public"],
diff --git a/src/conditions/BUILD.tools b/src/conditions/BUILD.tools
index 280be6578b..246302b758 100644
--- a/src/conditions/BUILD.tools
+++ b/src/conditions/BUILD.tools
@@ -11,6 +11,12 @@ config_setting(
 )
 
 config_setting(
+    name = "linux_aarch64",
+    values = {"cpu": "aarch64"},
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
     name = "darwin_x86_64",
     values = {"cpu": "darwin_x86_64"},
     visibility = ["//visibility:public"],
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
index d137664dbf..0986112da4 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL
@@ -61,6 +61,10 @@ default_toolchain {
   cpu: "tvos_arm64"
   toolchain_identifier: "tvos_arm64"
 }
+default_toolchain {
+  cpu: "aarch64"
+  toolchain_identifier: "darwin_x86_64"
+}
 toolchain {
   toolchain_identifier: "darwin_x86_64"
   host_system_name: "x86_64-apple-macosx"