From 02458f34431b9850725aafdb8beb1f31efa885fb Mon Sep 17 00:00:00 2001
From: Evgenii Kliuchnikov <eustas@google.com>
Date: Tue, 16 Jan 2024 03:36:27 -0800
Subject: further simplify Java build

PiperOrigin-RevId: 598790414
---
 java/BUILD.bazel     | 37 ++-----------------------------------
 java/WORKSPACE.bazel |  9 +++++++++
 2 files changed, 11 insertions(+), 35 deletions(-)

(limited to 'java')

diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index ea87b15..d61dce5 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -2,36 +2,6 @@ package(
     default_visibility = ["//visibility:public"],
 )
 
-config_setting(
-    name = "darwin",
-    values = {"cpu": "darwin"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "darwin_x86_64",
-    values = {"cpu": "darwin_x86_64"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows",
-    values = {"cpu": "x64_windows"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msvc",
-    values = {"cpu": "x64_windows_msvc"},
-    visibility = ["//visibility:public"],
-)
-
-config_setting(
-    name = "windows_msys",
-    values = {"cpu": "x64_windows_msys"},
-    visibility = ["//visibility:public"],
-)
-
 # >>> JNI headers
 
 genrule(
@@ -44,11 +14,8 @@ genrule(
 genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
-        ":darwin": ["@openjdk_macosx_jni_md_h//file"],
-        ":darwin_x86_64": ["@openjdk_macosx_jni_md_h//file"],
-        ":windows_msys": ["@openjdk_windows_jni_md_h//file"],
-        ":windows_msvc": ["@openjdk_windows_jni_md_h//file"],
-        ":windows": ["@openjdk_windows_jni_md_h//file"],
+        "@platforms//os:macos":  ["@openjdk_macosx_jni_md_h//file"],
+        "@platforms//os:windows": ["@openjdk_windows_jni_md_h//file"],
         "//conditions:default": ["@openjdk_solaris_jni_md_h//file"],
     }),
     outs = ["jni/jni_md.h"],
diff --git a/java/WORKSPACE.bazel b/java/WORKSPACE.bazel
index 5860423..a5c2138 100644
--- a/java/WORKSPACE.bazel
+++ b/java/WORKSPACE.bazel
@@ -27,6 +27,15 @@ maven_install(
     ],
 )
 
+http_archive(
+    name = "platforms",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
+        "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
+    ],
+    sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74",
+)
+
 http_file(
     name = "openjdk_jni_h",
     downloaded_file_path = "jni.h",
-- 
cgit v1.1