From 2ea4fa26281175c316651ec50784b820a9f409cf Mon Sep 17 00:00:00 2001
From: lberki <lberki@google.com>
Date: Wed, 11 Oct 2017 11:42:53 +0200
Subject: Remove support for --javabase=<absolute path>.

If an absolute javabase is desired, the following set of rules can be used:

java_runtime_suite(name="suite", default=":runtime")
java_runtime(name="runtime", java_home=<path to the JDK>)

Then --javabase can be pointed to the java_runtime_suite() rule.

Alternatively, the java_runtime rule can reference a Make variable:

java_runtime(name="runtime", java_home="$(ABSOLUTE_JAVABASE)")

Then the Javabase can be specified on the command line like this:

--javabase=<your package>:suite --define=ABSOLUTE_JAVABASE=<path to the JDK>

RELNOTES[INC]: --javabase=<absolute path> and --host_javabase=<absolute path>
are not supported anymore. If you need this functionality java_runtime_suite(name="suite", default=":runtime") java_runtime(name="runtime", java_home=<path to the JDK>) is an alternative.

PiperOrigin-RevId: 171798416
---
 scripts/bootstrap/bootstrap.sh | 2 --
 1 file changed, 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index eeac8d1d20..3f8ba74da2 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -58,7 +58,6 @@ if [ -z "${BAZEL-}" ]; then
     shift
     run_bazel_jar $command \
         ${_BAZEL_ARGS} --verbose_failures \
-        "--javabase=${JAVA_HOME}" "--host_javabase=${JAVA_HOME}" \
         --javacopt="-g -source ${JAVA_VERSION} -target ${JAVA_VERSION}" "${@}"
   }
 else
@@ -67,7 +66,6 @@ else
     shift
     ${BAZEL} --bazelrc=${BAZELRC} ${BAZEL_DIR_STARTUP_OPTIONS} $command \
         ${_BAZEL_ARGS} --verbose_failures \
-        "--javabase=${JAVA_HOME}" "--host_javabase=${JAVA_HOME}" \
         --javacopt="-g -source ${JAVA_VERSION} -target ${JAVA_VERSION}" "${@}"
   }
 fi
-- 
cgit v1.2.3