diff options
| author | Tobrun <tobrun@mapbox.com> | 2016-01-15 17:35:44 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2016-01-15 17:35:44 +0100 |
| commit | a79ef8bcc3a4981975a5c78a47f022e26671186c (patch) | |
| tree | 0d6ae0d497581180cd35e1e413e7b6731d8a8d3d /platform/android/gradlew | |
| parent | 2631f5bf9358e386286129f984beda90c1b9010e (diff) | |
| download | qtlocation-mapboxgl-a79ef8bcc3a4981975a5c78a47f022e26671186c.tar.gz | |
[android] #3052 - upgrade gradle to 2.10
Diffstat (limited to 'platform/android/gradlew')
| -rwxr-xr-x | platform/android/gradlew | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/platform/android/gradlew b/platform/android/gradlew index 91a7e269e1..9d82f78915 100755 --- a/platform/android/gradlew +++ b/platform/android/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` |