| commit | 7e65b6c1e53a51db0aa65126f2453f27daa0f22f | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Wed Apr 30 21:49:34 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 30 21:49:35 2014 +0000 |
| tree | 1b252f97b7de27ff997059d18241082ef39191c8 | |
| parent | 475a3d17d7594ee2b8bcf1ac826c490b49f116df [diff] | |
| parent | 75b58cc827faad56517181960f81f5b4bd8a08f0 [diff] |
Merge "Remove tblgen and clang-tblgen from prebuilts."
diff --git a/envsetup.sh b/envsetup.sh index f75bf88..60726d3 100644 --- a/envsetup.sh +++ b/envsetup.sh
@@ -1401,7 +1401,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