diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2016-04-18 20:44:30 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-04-19 09:46:41 +0000 |
| commit | 3ee570fc8bdd54eeb0c041645dbe7789bdcb3d8b (patch) | |
| tree | 6e5a83bca609b6e1fb5de94e6ddc0e5d6d1dbfb3 /src/test/shell | |
| parent | 08fb617b7e853e05a7536e9d078d46c4c040bb5e (diff) | |
Deprecate top-level Java toolchain flags in favour of java_toolchain
This change disables --java_langtools, --javabuilder_top, --singlejar_top,
--genclass_top, and --ijar_top, and finishes replacing them with
java_toolchain.{javac,javabuilder,singlejar,genclass,ijar}.
RELNOTES: Replace --java_langtools, --javabuilder_top, --singlejar_top,
--genclass_top, and --ijar_top with
java_toolchain.{javac,javabuilder,singlejar,genclass,ijar}
--
MOS_MIGRATED_REVID=120154954
Diffstat (limited to 'src/test/shell')
| -rw-r--r-- | src/test/shell/bazel/BUILD | 2 | ||||
| -rwxr-xr-x | src/test/shell/bazel/testenv.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 2e66d248e7..2762c988ee 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:private"]) genrule( name = "langtools-copy", testonly = 1, - srcs = ["//tools/defaults:java_langtools"], + srcs = ["//third_party/java/jdk/langtools:javac_jar"], outs = ["langtools.jar"], cmd = "cp $< $@", ) diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh index 0b0054bc4f..82b720307d 100755 --- a/src/test/shell/bazel/testenv.sh +++ b/src/test/shell/bazel/testenv.sh @@ -38,7 +38,7 @@ langtools="${TEST_SRCDIR}/src/test/shell/bazel/langtools.jar" # Tools directory location tools_dir="${TEST_SRCDIR}/tools" langtools_dir="${TEST_SRCDIR}/third_party/java/jdk/langtools" -EXTRA_BAZELRC="build --java_langtools=//tools/jdk:test-langtools --ios_sdk_version=8.4" +EXTRA_BAZELRC="build --ios_sdk_version=8.4" # Java tooling javabuilder_path="${TEST_SRCDIR}/src/java_tools/buildjar/JavaBuilder_deploy.jar" |