diff options
| author | Rémi Verschelde | 2017-08-04 09:45:19 +0200 |
|---|---|---|
| committer | GitHub | 2017-08-04 09:45:19 +0200 |
| commit | 7ac50b523b8cb313245e2fbdd16b5561c88b3aeb (patch) | |
| tree | 289e088899c2edc06e461914ab4614bc669d859b /platform/android/java/gradlew | |
| parent | 211dfa6602cff8605acfd29986dcf33f3c3176cc (diff) | |
| parent | 0d8556a7f0ec7290a1895bbee0a0dcf8112cb918 (diff) | |
| download | godot-7ac50b523b8cb313245e2fbdd16b5561c88b3aeb.tar.gz godot-7ac50b523b8cb313245e2fbdd16b5561c88b3aeb.tar.zst godot-7ac50b523b8cb313245e2fbdd16b5561c88b3aeb.zip | |
Merge pull request #9976 from ISylvox/update-gradle-android-master
[3.0] Update Gradle-Android buildtool
Diffstat (limited to 'platform/android/java/gradlew')
| -rwxr-xr-x | platform/android/java/gradlew | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/platform/android/java/gradlew b/platform/android/java/gradlew index 91a7e269e..9d82f7891 100755 --- a/platform/android/java/gradlew +++ b/platform/android/java/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` |