diff options
| -rwxr-xr-x | src/test/shell/bazel/bazel_java_test.sh | 10 | ||||
| -rw-r--r-- | tools/jdk/BUILD | 37 |
2 files changed, 4 insertions, 43 deletions
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh index 9d1b549f3e..852463140f 100755 --- a/src/test/shell/bazel/bazel_java_test.sh +++ b/src/test/shell/bazel/bazel_java_test.sh @@ -208,14 +208,12 @@ function test_build_hello_world() { bazel build //java/main:main &> $TEST_log || fail "build failed" } -# This test builds a simple java deploy jar using a java_toolchain which -# compiles singlejar and ijar from source. -function test_build_hello_world_with_customized_java_toolchain() { +# This test builds a simple java deploy jar using remote singlejar and ijar +# targets which compile them from source. +function test_build_hello_world_with_remote_embedded_tool_targets() { write_hello_library_files - bazel build //java/main:main_deploy.jar \ - --host_java_toolchain=@bazel_tools//tools/jdk:remote_toolchain \ - --java_toolchain=@bazel_tools//tools/jdk:remote_toolchain \ + bazel build //java/main:main_deploy.jar --define EXECUTOR=remote \ &> $TEST_log || fail "build failed" } diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD index 75aa5e46f6..fb24b3ea24 100644 --- a/tools/jdk/BUILD +++ b/tools/jdk/BUILD @@ -195,43 +195,6 @@ java_toolchain( target_version = "8", ) -java_toolchain( - name = "remote_toolchain", - bootclasspath = [":bootclasspath"], - compatible_javacopts = { - # Restrict protos to Java 7 so that they are compatible with Android. - "proto": [ - "-source", - "7", - "-target", - "7", - "-XDallowBetterNullChecks=false", - ], - }, - encoding = "UTF-8", - extclasspath = [":extclasspath"], - forcibly_disable_header_compilation = 0, - genclass = ["@bazel_tools//tools/jdk:genclass"], - header_compiler = ["@bazel_tools//tools/jdk:turbine"], - ijar = ["@bazel_tools//third_party/ijar:ijar"], - javabuilder = ["@bazel_tools//tools/jdk:javabuilder"], - javac = ["//third_party/java/jdk/langtools:javac_jar"], - javac_supports_workers = 1, - jvm_opts = [ - "-XX:+TieredCompilation", - "-XX:TieredStopAtLevel=1", - "-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)", - ], - misc = [ - "-XDskipDuplicateBridges=true", - "-g", - "-parameters", - ], - singlejar = ["@bazel_tools//src/tools/singlejar:singlejar"], - source_version = "8", - target_version = "8", -) - filegroup( name = "srcs", srcs = [ |