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

* commit '475a3d17d7594ee2b8bcf1ac826c490b49f116df': Use java_home to determine jdk location.
2014-04-30 15:12:53 +00:00
parent 1e4adfa837 475a3d17d7
commit 3f1d1608eb
1 changed files with 1 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1401,7 +1401,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