From 9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6 Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Fri, 16 Sep 2016 14:30:19 -0700
Subject: 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
---
 envsetup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'envsetup.sh')

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
 
-- 
cgit v1.1