diff options
| author | Jason Parks <jparks@google.com> | 2014-04-28 13:32:10 -0500 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-04-30 11:43:00 +0100 |
| commit | 30cfbd756be70fe61c6ff3b4ae2662ec5ba4c956 (patch) | |
| tree | 08dec928f3a59f8669c27b2d39073507dd11545d | |
| parent | 8afa25552efb51286fe0f010f0bf78fea71fc12a (diff) | |
| download | build-30cfbd756be70fe61c6ff3b4ae2662ec5ba4c956.tar.gz | |
Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.
(cherry-picked from commit 13b2e19ef240804908629ed2e54a98ec9dede337)
Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
| -rw-r--r-- | envsetup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index f75bf88599..60726d3350 100644 --- 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 |