Merge "TouchLatency: upgrade to gradle 4.8.1" into sc-dev (dd85a79e) · Commits · e / os / android_frameworks_base

tests/TouchLatency/gradle/wrapper/gradle-wrapper.jar

+4.42 KiB (53.1 KiB)

File changed.

No diff preview for this file type.

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

+1 −2

Original line number	Diff line number	Diff line
		#Tue Nov 27 13:37:59 PST 2018
		distributionBase=GRADLE_USER_HOME
		distributionPath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
		zipStoreBase=GRADLE_USER_HOME
		zipStorePath=wrapper/dists
		distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

tests/TouchLatency/gradlew

+43 −35

Original line number	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.
		DEFAULT_JVM_OPTS=""
		# 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\"`/" >/dev/null
		APP_HOME="`pwd -P`"
		cd "$SAVED" >/dev/null

		APP_NAME="Gradle"
		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.
		MAX_FD="maximum"

		@@ -30,6 +48,7 @@ die ( ) {
		cygwin=false
		msys=false
		darwin=false
		nonstop=false
		case "`uname`" in
		CYGWIN* )
		cygwin=true
		@@ -40,31 +59,11 @@ case "`uname`" in
		MINGW* )
		msys=true
		;;
		NONSTOP* )
		nonstop=true
		;;
		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

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

		# 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`
		if [ $? -eq 0 ] ; then
		if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
		@@ -114,6 +113,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`
		@@ -154,11 +154,19 @@ if $cygwin ; then
		esac
		fi

		# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
		function splitJvmOpts() {
		JVM_OPTS=("$@")
		# Escape application args
		save () {
		for i do printf %s\\n "$i" \| sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
		echo " "
		}
		eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
		JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
		APP_ARGS=$(save "$@")

		# 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	Diff line number	Diff line
		@@ -8,14 +8,14 @@
		@rem Set local scope for the variables with windows NT shell
		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
		if "%DIRNAME%" == "" set DIRNAME=.
		set APP_BASE_NAME=%~n0
		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
		if defined JAVA_HOME goto findJavaFromJavaHome

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

		: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 "%@eval[2+2]" == "4" goto 4NT_args

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

		set CMD_LINE_ARGS=%*
		goto execute

		:4NT_args
		@rem Get arguments from the 4NT Shell from JP Software
		set CMD_LINE_ARGS=%$

		:execute
		@rem Setup the command line