commit fe475cd362508ca4e7097105ee9027164ca41d7f
author Dark Eyes <dark_eyes_@hotmail.com> Tue Mar 08 22:05:10 2016 -0500
committer Patrick Graber <pjgraber03@gmail.com> Thu Mar 31 18:56:44 2016 -0700
tree 51ae40730b37f71390f68874e76c33d267a41681
parent 99017766e715c032211db2125a4756557045616b

envsetup: Always look up JAVA_HOME path

Change-Id: I8b0641eb107cd095079bb17f92e99730f532fda7

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 7b5c069..aa14aef 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -2055,7 +2055,7 @@
               export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
               ;;
           *)
-              export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+              export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))
               ;;
       esac