commit 5598ac44a4a119616ca08407cb6f0113c110c204
author adonovan <adonovan@google.com> Thu Apr 09 12:20:59 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Apr 09 12:22:07 2020 -0700
tree 59bf485703fded50cdf7014739298798918a5b4a
parent 03c6fbae8bc1a9437c00b95b11ec7ad236a831fe

bazel syntax: use Bazel 3.0's bundled JNI rule instead of hacks

PiperOrigin-RevId: 305734787

src/conditions/BUILD

diff --git a/src/conditions/BUILD b/src/conditions/BUILD
index 570401d..08049e9 100644
--- a/src/conditions/BUILD
+++ b/src/conditions/BUILD
@@ -10,6 +10,9 @@
     visibility = ["//src:__pkg__"],
 )
 
+# There is no config_setting for "linux".
+# See https://github.com/bazelbuild/bazel/issues/11107
+
 config_setting(
     name = "linux_ppc",
     values = {"cpu": "ppc"},

src/main/java/com/google/devtools/build/lib/syntax/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BUILD b/src/main/java/com/google/devtools/build/lib/syntax/BUILD
index 5442733..c301fbb 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BUILD
@@ -152,34 +152,14 @@
     name = "libcpu_profiler.so",
     srcs = select({
         "//src/conditions:darwin": ["cpu_profiler_posix.cc"],
+        # There is no config_setting for Linux.
+        # See https://github.com/bazelbuild/bazel/issues/11107
+        "//src/conditions:linux_aarch64": ["cpu_profiler_posix.cc"],
+        "//src/conditions:linux_ppc": ["cpu_profiler_posix.cc"],
+        "//src/conditions:linux_s390x": ["cpu_profiler_posix.cc"],
         "//src/conditions:linux_x86_64": ["cpu_profiler_posix.cc"],
         "//conditions:default": ["cpu_profiler_unimpl.cc"],
     }),
     linkshared = 1,
-    deps = [":jni"],  # TODO(adonovan): use @bazel_tools//tools/jdk:jni when released
-)
-
-# This has been copied to @bazel_tools//tools/jdk:jni and will appear in the next release.
-cc_library(
-    name = "jni",
-    hdrs = ["@bazel_tools//tools/jdk:jni_header"] + select({
-        "//src/conditions:linux_x86_64": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
-        "//src/conditions:linux_aarch64": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
-        "//src/conditions:linux_ppc": ["@bazel_tools//tools/jdk:jni_md_header-linux"],
-        "//src/conditions:darwin": ["@bazel_tools//tools/jdk:jni_md_header-darwin"],
-        "//src/conditions:freebsd": ["@bazel_tools//tools/jdk:jni_md_header-freebsd"],
-        "//src/conditions:openbsd": ["@bazel_tools//tools/jdk:jni_md_header-openbsd"],
-        "//src/conditions:windows": ["@bazel_tools//tools/jdk:jni_md_header-windows"],
-        "//conditions:default": [],
-    }),
-    includes = ["../../../../../../../../../external/bazel_tools/tools/jdk/include"] + select({
-        "//src/conditions:linux_x86_64": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/linux"],
-        "//src/conditions:linux_aarch64": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/linux"],
-        "//src/conditions:linux_ppc": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/linux"],
-        "//src/conditions:darwin": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/darwin"],
-        "//src/conditions:freebsd": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/freebsd"],
-        "//src/conditions:openbsd": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/openbsd"],
-        "//src/conditions:windows": ["../../../../../../../../../external/bazel_tools/tools/jdk/include/win32"],
-        "//conditions:default": [],
-    }),
+    deps = ["@bazel_tools//tools/jdk:jni"],
 )