summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Mok <kmok@cyngn.com>2016-09-16 14:30:19 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-09-28 07:36:13 -0700
commit9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6 (patch)
treeb8935f3b1c7b1b4b3683cedb2ec1a0b09c0ccfd8
parent07c1234af2b2ccb16ade799e4a755497bb28ed07 (diff)
downloadbuild-9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6.zip
build-9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6.tar.gz
build-9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6.tar.bz2
Revert "envsetup: Always look up JAVA_HOME path"
This breaks, if we have both jdk7 and jdk8 installed on same machine. This reverts commit bc9ae3d5c21915c165b2b2cb41d07e1573814254. Change-Id: Id0482d130d5306e797adfeeaeb2efbd1e25aa3ee
-rw-r--r--envsetup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 03a6424..c93db03 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -2406,7 +2406,7 @@ function set_java_home() {
export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
;;
*)
- export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java)))))
+ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
;;
esac