commit 48c776b9979efeae0f42988c67368f4eb8d8ff1b
author Stefan Zager <szager@chromium.org> Wed Oct 09 13:01:25 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Oct 10 18:07:00 2013 +0000
tree 6baa4d1f778e24ce956d556a72c61aec61a1cd83
parent e719ef4248770c19bc60eeecc439752170fb1ed5

Explicitly select a system default jvm.

The java-config package atm does not support $ROOT.  Select a default
VM ourselves until that gets fixed upstream.

BUG=None
TEST=cbuildbot -g 172408 --remote chromium-sdk

Change-Id: Idc66e494fdb6870725fe8685d60f5578e20dc8e4
Reviewed-on: https://chromium-review.googlesource.com/172408
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Stefan Zager <szager@chromium.org>
Tested-by: Stefan Zager <szager@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 3108825..47bff30 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -513,6 +513,10 @@
 fi
 enter_chroot "${CHROOT_TRUNK_DIR}/src/scripts/update_chroot" "${UPDATE_ARGS[@]}"
 
+# The java-config package atm does not support $ROOT.  Select a default
+# VM ourselves until that gets fixed upstream.
+enter_chroot sudo java-config --set-system-vm 1
+
 CHROOT_EXAMPLE_OPT=""
 if [[ "$FLAGS_chroot" != "$DEFAULT_CHROOT_DIR" ]]; then
   CHROOT_EXAMPLE_OPT="--chroot=$FLAGS_chroot"