commit 30c601dc13d9e1b40a57434c022c888c7578cc56
author cushon <cushon@google.com> Wed Aug 08 09:09:08 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Aug 08 09:10:56 2018 -0700
tree 32827f2553c7cc637088eeec7bd5199068b6dcfb
parent 3862a807881e423daf88eb47286077e99d4bac08

Don't use @local_jdk for jni headers

instead, read the heads from the configured java runtime, so the values
track with changes to --javabase.

See #5594

PiperOrigin-RevId: 207894086

tools/jdk/BUILD

diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index d246382..f1202e5 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -3,6 +3,7 @@
 load(
     "//tools/jdk:default_java_toolchain.bzl",
     "default_java_toolchain",
+    "java_runtime_files",
     "DEFAULT_JAVACOPTS",
 )
 
@@ -32,29 +33,29 @@
     actual = "@bazel_tools//tools/jdk:current_java_runtime",
 )
 
-alias(
+java_runtime_files(
     name = "jni_header",
-    actual = "@local_jdk//:jni_header",
+    srcs = ["include/jni.h"],
 )
 
-alias(
+java_runtime_files(
     name = "jni_md_header-darwin",
-    actual = "@local_jdk//:jni_md_header-darwin",
+    srcs = ["include/darwin/jni_md.h"],
 )
 
-alias(
+java_runtime_files(
     name = "jni_md_header-linux",
-    actual = "@local_jdk//:jni_md_header-linux",
+    srcs = ["include/linux/jni_md.h"],
 )
 
-alias(
+java_runtime_files(
     name = "jni_md_header-windows",
-    actual = "@local_jdk//:jni_md_header-windows",
+    srcs = ["include/win32/jni_md.h"],
 )
 
-alias(
+java_runtime_files(
     name = "jni_md_header-freebsd",
-    actual = "@local_jdk//:jni_md_header-freebsd",
+    srcs = ["include/freebsd/jni_md.h"],
 )
 
 alias(