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

* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1': Use java_home to determine jdk location.
2014-04-30 15:37:38 +00:00 · 2014-04-30 15:37:38 +00:00 · 7d26e97e7f
parent 6a27520295 3f1d1608eb
commit 7d26e97e7f
1 changed files with 1 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@ -1407,7 +1407,7 @@ function set_java_home() {
      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