forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dev-util/android-studio: keep jre symlink but use JAVA_HOME first
Closes: https://bugs.gentoo.org/660404 Package-Manager: Portage-2.3.40, Repoman-2.3.9
- Loading branch information
Showing
2 changed files
with
44 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
dev-util/android-studio/files/0001-use-java-home-before-bundled.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
Use JAVA_HOME before bundled jre | ||
|
||
Must keep bundled jre symlink around in case "Use Embedded JDK" is selected | ||
|
||
https://bugs.gentoo.org/613868 | ||
https://bugs.gentoo.org/660404 | ||
|
||
--- android-studio/bin/studio.sh 2018-07-20 13:43:12.339049033 +0800 | ||
+++ android-studio/bin/studio.sh 2018-07-20 13:43:38.494932028 +0800 | ||
@@ -73,6 +73,14 @@ | ||
fi | ||
fi | ||
|
||
+if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then | ||
+ JDK="$JDK_HOME" | ||
+fi | ||
+ | ||
+if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then | ||
+ JDK="$JAVA_HOME" | ||
+fi | ||
+ | ||
if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then | ||
BUNDLED_JRE="$IDE_HOME/jre64" | ||
if [ ! -d "$BUNDLED_JRE" ]; then | ||
@@ -83,14 +91,6 @@ | ||
fi | ||
fi | ||
|
||
-if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then | ||
- JDK="$JDK_HOME" | ||
-fi | ||
- | ||
-if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then | ||
- JDK="$JAVA_HOME" | ||
-fi | ||
- | ||
if [ -z "$JDK" ]; then | ||
JDK_PATH=`which java` | ||
|