am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1':
Use java_home to determine jdk location.
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