commit ac3f31ea9b4df81ae789ba8fb67d3df5ffb72940
author Jeffrey van Gogh <jvg@google.com> Tue Aug 30 23:34:29 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 30 23:34:30 2016 +0000
tree 730925f5a4b41523677459744f97ac407d438ecb
parent e4cc80c6689859a5c22351d76821741879752de0
parent fb57b0ff49858b452ddb77ce5c7be1791aabc0af

Merge "use java from JDK_18_x64 env variable"

linux-x86_64/kythe/studio/build_studio_kythe.sh

diff --git a/linux-x86_64/kythe/studio/build_studio_kythe.sh b/linux-x86_64/kythe/studio/build_studio_kythe.sh
index 64ab1ad..c2079e2 100755
--- a/linux-x86_64/kythe/studio/build_studio_kythe.sh
+++ b/linux-x86_64/kythe/studio/build_studio_kythe.sh
@@ -16,6 +16,12 @@
   echo $0 must be launched from the root of the studio branch.
   exit 1
 fi
+
+if [ -z "${JDK_18_x64}" ]; then
+  echo $0 requires the JDK_18_x64 env variable to be defined.
+  exit 1
+fi
+
 OUT_ENTRIES="${OUT}/entries"
 mkdir -p "${OUT_ENTRIES}"
 
@@ -35,7 +41,8 @@
 for KINDEX in ${KINDEXES}; do
   ENTRIES="$(basename "${KINDEX}").entries"
   if [ ! -f "${ENTRIES}" ]; then
-    java -jar "${KYTHE_ROOT}/indexers/java_indexer.jar" \
+    "${JDK_18_x64}/bin/java" -jar \
+    "${KYTHE_ROOT}/indexers/java_indexer.jar" \
       "${KINDEX}" > "${ENTRIES}"
   fi
 done;