commit 13b2e19ef240804908629ed2e54a98ec9dede337
author Jason Parks <jparks@google.com> Mon Apr 28 13:32:10 2014 -0500
committer Jason Parks <jparks@google.com> Mon Apr 28 13:32:38 2014 -0500
tree 40121300f1fc17ca721a5a1fc6a59763f1f715c5
parent 5ffee768ea6ead544e7c8927853d0b03d2216b10

Use java_home to determine jdk location.

Specifying the major version rather than hard coding
to a minor version.

Change-Id: Ieccec98c1b41e3eb7f512bcebc83f6034d634862

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 0c8ae30..6891747 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1407,7 +1407,7 @@
       else
         case `uname -s` in
             Darwin)
-                export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.7.0_51.jdk/Contents/Home
+                export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
                 ;;
             *)
                 export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64