From 16ba5cae5bc4f206b6c1d70dd94f419ea5b1686e Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 13 Apr 2017 16:53:37 +0800
Subject: [PATCH] envsetup.sh: support different openjdk locations

Some distributions install openjdk in a different location than Ubuntu.
Try to detect them one by one.

Tested OK on Fedora with openjdk-1.7.0.
---
 envsetup.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/envsetup.sh b/envsetup.sh
index 6ad3a9e80..ba2379fbb 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1421,7 +1421,10 @@ function set_java_home() {
               export JAVA_HOME=$(/usr/libexec/java_home -v 1.7)
               ;;
           *)
-              export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
+              for j in java-1.7.0 java-7-openjdk-amd64; do
+                  [ -d /usr/lib/jvm/$j ] && break
+              done
+              export JAVA_HOME=/usr/lib/jvm/$j
               ;;
       esac
 
-- 
2.11.0