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 /scripts | |
| 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 'scripts')
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index 2fea800680..1394b62acb 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -30,10 +30,7 @@ fi : ${JAVA_VERSION:="1.8"} -: ${BAZEL_ARGS:=--singlejar_top=//src/java_tools/singlejar:bootstrap_deploy.jar \ - --javabuilder_top=//src/java_tools/buildjar:bootstrap_deploy.jar \ - --genclass_top=//src/java_tools/buildjar:bootstrap_genclass_deploy.jar \ - --ijar_top=//third_party/ijar \ +: ${BAZEL_ARGS:=--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ --strategy=Javac=worker --worker_quit_after_build \ --genrule_strategy=standalone --spawn_strategy=standalone \ "${EXTRA_BAZEL_ARGS:-}"} |