From 7000c31795a656c721cc282107029218be6360f2 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <meumertzheim@code-intelligence.com>
Date: Wed, 5 May 2021 14:29:11 +0200
Subject: Simplify Bazel handling of JNI headers

Use a Bazel provided target for the JNI headers instead of a custom one.
---
 third_party/jni/BUILD.bazel | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'third_party')

diff --git a/third_party/jni/BUILD.bazel b/third_party/jni/BUILD.bazel
index 21f3fe1f..cd181e8e 100644
--- a/third_party/jni/BUILD.bazel
+++ b/third_party/jni/BUILD.bazel
@@ -2,8 +2,7 @@ load("@rules_cc//cc:defs.bzl", "cc_import", "cc_library")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 
 cc_library(
-    name = "jni",
-    hdrs = [":jni_headers"],
+    name = "jni_libs",
     visibility = ["//visibility:public"],
     deps = select({
         "@platforms//os:osx": [":libjvm_osx"],
@@ -11,40 +10,6 @@ cc_library(
     }),
 )
 
-cc_library(
-    name = "jni_headers_only",
-    hdrs = [
-        ":jni_headers",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "jni_md_header",
-    srcs = select({
-        "@platforms//os:osx": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
-        "@platforms//os:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
-        "//conditions:default": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
-    }),
-    outs = ["jni_md.h"],
-    cmd = "cp -f $< $@",
-)
-
-genrule(
-    name = "jni_header",
-    srcs = ["@bazel_tools//tools/jdk:jni_header"],
-    outs = ["jni.h"],
-    cmd = "cp -f $< $@",
-)
-
-filegroup(
-    name = "jni_headers",
-    srcs = [
-        ":jni_header",
-        ":jni_md_header",
-    ],
-)
-
 bool_flag(
     name = "jdk_8",
     build_setting_default = False,
-- 
cgit v1.2.3