diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2016-05-05 22:35:18 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-05-06 09:35:19 +0000 |
| commit | e4880eb0eea91307aa2a79e106d745b40281d5d3 (patch) | |
| tree | f6146754bd897f509bc952415cb0609f8cd5ea4a | |
| parent | 9ca91a2d8933374c708937a3be602b22af76ddc1 (diff) | |
Add turbine to embedded tools
This allows --experimental_java_header_compilation=true to be used with Bazel.
It is still off by default.
--
MOS_MIGRATED_REVID=121623213
| -rw-r--r-- | src/BUILD | 1 | ||||
| -rwxr-xr-x | src/create_embedded_tools.sh | 1 | ||||
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD | 1 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 1 |
4 files changed, 4 insertions, 0 deletions
@@ -135,6 +135,7 @@ genrule( "//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools", "//src/main/protobuf:srcs", "//src/java_tools/buildjar:JavaBuilderDeploy", + "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_deploy.jar", "//src/java_tools/singlejar:SingleJar_deploy.jar", "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar", "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar", diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh index ffbb89c104..c41db4a0e2 100755 --- a/src/create_embedded_tools.sh +++ b/src/create_embedded_tools.sh @@ -30,6 +30,7 @@ for i in $*; do case "$i" in *tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;; *JavaBuilder*_deploy.jar) OUTPUT_PATH=tools/jdk/JavaBuilder_deploy.jar ;; + *turbine_deploy.jar) OUTPUT_PATH=tools/jdk/turbine_deploy.jar ;; *javac.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac.jar ;; *javac7.jar) OUTPUT_PATH=third_party/java/jdk/langtools/javac7.jar ;; *SingleJar_deploy.jar) OUTPUT_PATH=tools/jdk/SingleJar_deploy.jar ;; diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD index 523e4acb15..567080e8f9 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD @@ -8,6 +8,7 @@ package(default_visibility = [":packages"]) java_binary( name = "turbine", main_class = "com.google.devtools.build.java.turbine.javac.JavacTurbine", + visibility = ["//visibility:public"], runtime_deps = [ "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac:javac_turbine", ], diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 220815f51d..96581b0660 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -120,6 +120,7 @@ java_toolchain( encoding = "UTF-8", extclasspath = [":extdir"], genclass = ["//tools/jdk:GenClass_deploy.jar"], + header_compiler = ["//tools/jdk:turbine_deploy.jar"], ijar = ["@bazel_tools//tools/jdk:ijar"], javabuilder = ["//tools/jdk:JavaBuilder_deploy.jar"], javac = ["//third_party/java/jdk/langtools:javac_jar"], |