commit 1c61d0831cf503a67484a13a01747cd40f1a7b30
author Adrian DC <radian.dc@gmail.com> Thu Oct 06 13:42:43 2016 +0200
committer Vaughn N <rwaterspf1@floydco.net> Thu Oct 13 21:39:58 2016 -0400
tree 08cb6f548ece5f83afc0d1fe94fd51c3cb2d2b75
parent e3e25d19557e8e974dd7477203edd1dfa7ba57fa

build: Support a fallback to java 8 if java 7 is not found

 * In the case of a host installed only with java 8,
    the build starts correctly but on use of JAVA_HOME
    binaries, the java references are missing

 * Allow the java 7 to be tested and try to use java 8

Change-Id: Ie50892edb54feb8608a0ef80a1c2a8667703e8ee

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 2bd2ae7..96af100 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -2055,7 +2055,8 @@
                 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
                 ;;
         esac
-      else
+      fi
+      if [ ! "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]; then
         case `uname -s` in
             Darwin)
                 export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)