OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f9c583
)
envsetup.sh: support different openjdk locations
android-x86-6.0-r3
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Thu, 13 Apr 2017 08:53:37 +0000
(16:53 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Thu, 13 Apr 2017 08:53:37 +0000
(16:53 +0800)
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
patch
|
blob
|
history
diff --git
a/envsetup.sh
b/envsetup.sh
index
6ad3a9e
..
ba2379f
100644
(file)
--- 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