From 1045ab52dfd00290e8fbfbca61e9131186ba7b62 Mon Sep 17 00:00:00 2001
From: Evgenii Kliuchnikov <eustas@google.com>
Date: Thu, 4 Jan 2024 03:32:33 -0800
Subject: Fix/simplify/improve Bazel build

PiperOrigin-RevId: 595656443
---
 java/BUILD.bazel                        | 40 ++++++++++++++++++++++++++++-----
 java/WORKSPACE.bazel                    | 10 ++++-----
 java/org/brotli/integration/BUILD.bazel | 22 +++++++++---------
 3 files changed, 52 insertions(+), 20 deletions(-)

(limited to 'java')

diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index 0ae6c15..ea87b15 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -2,6 +2,36 @@ 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(
@@ -14,11 +44,11 @@ genrule(
 genrule(
     name = "copy_link_jni_md_header",
     srcs = select({
-        "@org_brotli//:darwin": ["@openjdk_macosx_jni_md_h//file"],
-        "@org_brotli//:darwin_x86_64": ["@openjdk_macosx_jni_md_h//file"],
-        "@org_brotli//:windows_msys": ["@openjdk_windows_jni_md_h//file"],
-        "@org_brotli//:windows_msvc": ["@openjdk_windows_jni_md_h//file"],
-        "@org_brotli//:windows": ["@openjdk_windows_jni_md_h//file"],
+        ":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"],
         "//conditions:default": ["@openjdk_solaris_jni_md_h//file"],
     }),
     outs = ["jni/jni_md.h"],
diff --git a/java/WORKSPACE.bazel b/java/WORKSPACE.bazel
index 3ac9d4b..5860423 100644
--- a/java/WORKSPACE.bazel
+++ b/java/WORKSPACE.bazel
@@ -30,27 +30,27 @@ maven_install(
 http_file(
     name = "openjdk_jni_h",
     downloaded_file_path = "jni.h",
-    urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/share/javavm/export/jni.h"],
+    urls = ["https://raw.githubusercontent.com/openjdk/jdk/jdk8-b120/jdk/src/share/javavm/export/jni.h"],
     sha256 = "ed99792df48670072b78028faf704a8dcb6868fe140ccc7eced9b01dfa62fef4",
 )
 
 http_file(
     name = "openjdk_solaris_jni_md_h",
     downloaded_file_path = "jni_md.h",
-    urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/solaris/javavm/export/jni_md.h"],
-    sha256 = "ecbe6944fe1a4290644d5a6b3c8f68576798a53b9da12cd31c58c48569595ff7",
+    urls = ["https://raw.githubusercontent.com/openjdk/jdk/jdk8-b120/jdk/src/solaris/javavm/export/jni_md.h"],
+    sha256 = "b6cf7b06e5bba38d2daa2ff0789f99d396b3cb3bcc37d0367c8360fdccdef294",
 )
 
 http_file(
     name = "openjdk_macosx_jni_md_h",
     downloaded_file_path = "jni_md.h",
-    urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/macosx/javavm/export/jni_md.h"],
+    urls = ["https://raw.githubusercontent.com/openjdk/jdk/jdk8-b120/jdk/src/macosx/javavm/export/jni_md.h"],
     sha256 = "8f718071022e7e7f2fc9a229984b7e83582db91ed83861b49ce1461436fe8dc4",
 )
 
 http_file(
     name = "openjdk_windows_jni_md_h",
     downloaded_file_path = "jni_md.h",
-    urls = ["https://hg.openjdk.java.net/jdk8/jdk8/jdk/raw-file/687fd7c7986d/src/windows/javavm/export/jni_md.h"],
+    urls = ["https://raw.githubusercontent.com/openjdk/jdk/jdk8-b120/jdk/src/windows/javavm/export/jni_md.h"],
     sha256 = "5479fb385ea1e11619f5c0cdfd9ccb3ea3a3fea0f5bc6176fb3ce62be29d759b",
 )
diff --git a/java/org/brotli/integration/BUILD.bazel b/java/org/brotli/integration/BUILD.bazel
index 5b77325..4607cda 100644
--- a/java/org/brotli/integration/BUILD.bazel
+++ b/java/org/brotli/integration/BUILD.bazel
@@ -37,8 +37,8 @@ java_binary(
 
 java_test(
     name = "bundle_checker_data_test",
-    args = ["org/brotli/integration/test_data.zip"],
-    data = ["test_data.zip"],
+    args = ["$(location :test_data)"],
+    data = [":test_data"],
     main_class = "org.brotli.integration.BundleChecker",
     use_testrunner = 0,
     runtime_deps = [":bundle_checker"],
@@ -48,26 +48,28 @@ java_test(
     name = "bundle_checker_fuzz_test",
     args = [
         "-s",
-        "org/brotli/integration/fuzz_data.zip",
+        "$(location :fuzz_data)",
     ],
-    data = ["fuzz_data.zip"],
+    data = [":fuzz_data"],
     main_class = "org.brotli.integration.BundleChecker",
     use_testrunner = 0,
     runtime_deps = [":bundle_checker"],
 )
 
 filegroup(
+    name = "fuzz_data",
+    srcs = ["fuzz_data.zip"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
     name = "test_data",
     srcs = ["test_data.zip"],
-    visibility = [
-        "//org/brotli/wrapper/dec:__pkg__",
-    ],
+    visibility = ["//org/brotli/wrapper/dec:__pkg__"],
 )
 
 filegroup(
     name = "test_corpus",
     srcs = ["test_corpus.zip"],
-    visibility = [
-        "//org/brotli/wrapper/enc:__pkg__",
-    ],
+    visibility = ["//org/brotli/wrapper/enc:__pkg__"],
 )
-- 
cgit v1.1