commit 3dcb7fdee05f12e8f6379e0d9243a516f6879392
author Carmelo Cascone <carmelo@opennetworking.org> Wed Jun 26 14:08:36 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Jun 26 15:53:30 2019 -0700
tree b356c902e2576736c583590395278369793b4b55
parent 7d54994b50407d539d082f132390f01f48c9ea5e

Optionally support building and running with locally installed JDK

Change-Id: Ie08a4bf7952c0ed62dbc31dba0faa33eae9b133d

tools/build/jdk/BUILD

diff --git a/tools/build/jdk/BUILD b/tools/build/jdk/BUILD
index 84856ee..59934fc 100644
--- a/tools/build/jdk/BUILD
+++ b/tools/build/jdk/BUILD
@@ -28,16 +28,16 @@
 #  produced JDK tar.
 
 genrule(
-    name = "default_jdk_tar",
+    name = "current_jdk_tar",
     srcs = [
         "@bazel_tools//tools/jdk:current_java_runtime",
         ":conf-security",
     ],
-    outs = ["default_jdk.tar.gz"],
-    cmd = "mkdir default_jdk && " +
-          "mv $(JAVABASE)/* default_jdk/ && " +
-          "mv tools/build/jdk/* default_jdk/ && " +
-          "tar -hczf $(location default_jdk.tar.gz) default_jdk",
+    outs = ["current_jdk.tar.gz"],
+    cmd = "mkdir current_jdk && " +
+          "cp -r $(JAVABASE)/* current_jdk/ && " +
+          "cp -r tools/build/jdk/* current_jdk/ && " +
+          "tar -hczf $(location current_jdk.tar.gz) current_jdk",
     output_to_bindir = True,
     toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
     visibility = ["//visibility:public"],