Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0adf0ee8 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "TouchLatency: upgrade to gradle 4.8.1" into sc-dev am: dd85a79e am: 01211b80 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457953

Change-Id: I46b2b5833a44e2227fb4338133a1dd1f4efa1cfe
parents 9f6bdf95 01211b80

tests/TouchLatency/gradle/wrapper/gradle-wrapper.properties

+1 −2
Original line number Original line Diff line number Diff line 
#Tue Nov 27 13:37:59 PST 2018

distributionBase=GRADLE_USER_HOME

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionPath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip

zipStoreBase=GRADLE_USER_HOME

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists
 
zipStorePath=wrapper/dists
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

tests/TouchLatency/gradlew

+43 −35
Original line number Original line Diff line number Diff line 
#!/usr/bin/env bash

#!/usr/bin/env sh





##############################################################################

##############################################################################

##

##
@@ -6,12 +6,30 @@ 
##

##

##############################################################################

##############################################################################





# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

# Attempt to set APP_HOME

DEFAULT_JVM_OPTS=""

# Resolve links: $0 may be a link

PRG="$0"

# Need this for relative symlinks.

while [ -h "$PRG" ] ; do

    ls=`ls -ld "$PRG"`

    link=`expr "$ls" : '.*-> \(.*\)$'`

    if expr "$link" : '/.*' > /dev/null; then

        PRG="$link"

    else

        PRG=`dirname "$PRG"`"/$link"

    fi

done

SAVED="`pwd`"

cd "`dirname \"$PRG\"`/" >/dev/null

APP_HOME="`pwd -P`"

cd "$SAVED" >/dev/null





APP_NAME="Gradle"

APP_NAME="Gradle"

APP_BASE_NAME=`basename "$0"`

APP_BASE_NAME=`basename "$0"`





# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

DEFAULT_JVM_OPTS=""



# Use the maximum available, or set MAX_FD != -1 to use that value.

# Use the maximum available, or set MAX_FD != -1 to use that value.

MAX_FD="maximum"

MAX_FD="maximum"
@@ -30,6 +48,7 @@ die ( ) { 
cygwin=false

cygwin=false

msys=false

msys=false

darwin=false

darwin=false

nonstop=false

case "`uname`" in

case "`uname`" in

  CYGWIN* )

  CYGWIN* )

    cygwin=true

    cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in 
  MINGW* )

  MINGW* )

    msys=true

    msys=true

    ;;

    ;;

  NONSTOP* )

    nonstop=true

    ;;

esac

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"

# Need this for relative symlinks.

while [ -h "$PRG" ] ; do

    ls=`ls -ld "$PRG"`

    link=`expr "$ls" : '.*-> \(.*\)$'`

    if expr "$link" : '/.*' > /dev/null; then

        PRG="$link"

    else

        PRG=`dirname "$PRG"`"/$link"

    fi

done

SAVED="`pwd`"

cd "`dirname \"$PRG\"`/" >&-

APP_HOME="`pwd -P`"

cd "$SAVED" >&-



CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar





# Determine the Java command to use to start the JVM.

# Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation." 
fi

fi





# Increase the maximum file descriptors if we can.

# Increase the maximum file descriptors if we can.

if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then

if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then

    MAX_FD_LIMIT=`ulimit -H -n`

    MAX_FD_LIMIT=`ulimit -H -n`

    if [ $? -eq 0 ] ; then

    if [ $? -eq 0 ] ; then

        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then

        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi 
if $cygwin ; then

if $cygwin ; then

    APP_HOME=`cygpath --path --mixed "$APP_HOME"`

    APP_HOME=`cygpath --path --mixed "$APP_HOME"`

    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

    JAVACMD=`cygpath --unix "$JAVACMD"`





    # We build the pattern for arguments to be converted via cygpath

    # We build the pattern for arguments to be converted via cygpath

    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then 
    esac

    esac

fi

fi





# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules

# Escape application args

function splitJvmOpts() {

save () {

    JVM_OPTS=("$@")

    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done

    echo " "

}

}

eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS

APP_ARGS=$(save "$@")

JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"



# Collect all arguments for the java command, following the shell quoting and substitution rules

eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"



# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong

if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

  cd "$(dirname "$0")"

fi





exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
 
exec "$JAVACMD" "$@"

tests/TouchLatency/gradlew.bat

+4 −10
Original line number Original line Diff line number Diff line
@@ -8,14 +8,14 @@ 
@rem Set local scope for the variables with windows NT shell

@rem Set local scope for the variables with windows NT shell

if "%OS%"=="Windows_NT" setlocal

if "%OS%"=="Windows_NT" setlocal





@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

set DEFAULT_JVM_OPTS=



set DIRNAME=%~dp0

set DIRNAME=%~dp0

if "%DIRNAME%" == "" set DIRNAME=.

if "%DIRNAME%" == "" set DIRNAME=.

set APP_BASE_NAME=%~n0

set APP_BASE_NAME=%~n0

set APP_HOME=%DIRNAME%

set APP_HOME=%DIRNAME%





@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

set DEFAULT_JVM_OPTS=



@rem Find java.exe

@rem Find java.exe

if defined JAVA_HOME goto findJavaFromJavaHome

if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation. 
goto fail

goto fail





:init

:init

@rem Get command-line arguments, handling Windowz variants

@rem Get command-line arguments, handling Windows variants





if not "%OS%" == "Windows_NT" goto win9xME_args

if not "%OS%" == "Windows_NT" goto win9xME_args

if "%@eval[2+2]" == "4" goto 4NT_args





:win9xME_args

:win9xME_args

@rem Slurp the command line arguments.

@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2 
if "x%~1" == "x" goto execute

if "x%~1" == "x" goto execute





set CMD_LINE_ARGS=%*

set CMD_LINE_ARGS=%*

goto execute



:4NT_args

@rem Get arguments from the 4NT Shell from JP Software

set CMD_LINE_ARGS=%$





:execute

:execute

@rem Setup the command line

@rem Setup the command line