From 13b2e19ef240804908629ed2e54a98ec9dede337 Mon Sep 17 00:00:00 2001 From: Jason Parks Date: Mon, 28 Apr 2014 13:32:10 -0500 Subject: [PATCH] Use java_home to determine jdk location. Specifying the major version rather than hard coding to a minor version. Change-Id: Ieccec98c1b41e3eb7f512bcebc83f6034d634862 --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 0c8ae3099..689174726 100644 --- 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 -- 2.11.0