commit 475a3d17d7594ee2b8bcf1ac826c490b49f116df
author Narayan Kamath <narayan@google.com> Wed Apr 30 10:45:51 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 30 10:45:51 2014 +0000
tree 08dec928f3a59f8669c27b2d39073507dd11545d
parent 8afa25552efb51286fe0f010f0bf78fea71fc12a
parent 30cfbd756be70fe61c6ff3b4ae2662ec5ba4c956

Merge "Use java_home to determine jdk location."

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index f75bf88..60726d3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1401,7 +1401,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