commit 7d26e97e7f7ecc8ee7af373d5a5e3c96d317c910
author Narayan Kamath <narayan@google.com> Wed Apr 30 15:37:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 30 15:37:38 2014 +0000
tree 0eb002b8029a9446bcd1b7482d605483f2052f41
parent 6a27520295601f53ae80d1e764e072162e9f481c
parent 3f1d1608ebc4a0c307c94b67943bee004d8428a1

am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."

* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1':
  Use java_home to determine jdk location.

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index f29cbcd..b5d43ac 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