diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar
deleted file mode 100644
index 7b24bccd..00000000
Binary files a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.jar and /dev/null differ
diff --git a/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.uiautoapk b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.uiautoapk
new file mode 100644
index 00000000..f6c2f6bc
Binary files /dev/null and b/wlauto/workloads/antutu/com.arm.wlauto.uiauto.antutu.uiautoapk differ
diff --git a/wlauto/workloads/antutu/uiauto/app/build.gradle b/wlauto/workloads/antutu/uiauto/app/build.gradle
new file mode 100644
index 00000000..51272a42
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/app/build.gradle
@@ -0,0 +1,35 @@
+apply plugin: 'com.android.application'
+
+def packageName = "com.arm.wlauto.uiauto.antutu"
+
+android {
+ compileSdkVersion 25
+ buildToolsVersion "25.0.3"
+ defaultConfig {
+ applicationId "${packageName}"
+ minSdkVersion 18
+ targetSdkVersion 25
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ }
+ buildTypes {
+ applicationVariants.all { variant ->
+ variant.outputs.each { output ->
+ output.outputFile = file("$project.buildDir/apk/${packageName}.apk")
+ }
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile 'com.android.support.test:runner:0.5'
+ compile 'com.android.support.test:rules:0.5'
+ compile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
+ compile(name: 'uiauto', ext:'aar')
+}
+
+repositories {
+ flatDir {
+ dirs 'libs'
+ }
+}
diff --git a/wlauto/workloads/antutu/uiauto/app/src/main/AndroidManifest.xml b/wlauto/workloads/antutu/uiauto/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..ef75f64d
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/app/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/antutu/uiauto/app/src/main/java/com/arm/wlauto/uiauto/antutu/UiAutomation.java
similarity index 77%
rename from wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
rename to wlauto/workloads/antutu/uiauto/app/src/main/java/com/arm/wlauto/uiauto/antutu/UiAutomation.java
index d17a1488..797ecfbc 100644
--- a/wlauto/workloads/antutu/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
+++ b/wlauto/workloads/antutu/uiauto/app/src/main/java/com/arm/wlauto/uiauto/antutu/UiAutomation.java
@@ -16,24 +16,27 @@
package com.arm.wlauto.uiauto.antutu;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.concurrent.TimeUnit;
-
import android.app.Activity;
import android.os.Bundle;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiScrollable;
+import android.support.test.uiautomator.UiSelector;
import android.util.Log;
-// Import the uiautomator libraries
-import com.android.uiautomator.core.UiObject;
-import com.android.uiautomator.core.UiObjectNotFoundException;
-import com.android.uiautomator.core.UiScrollable;
-import com.android.uiautomator.core.UiSelector;
-import com.android.uiautomator.core.UiCollection;
-import com.android.uiautomator.testrunner.UiAutomatorTestCase;
-
import com.arm.wlauto.uiauto.BaseUiAutomation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+// Import the uiautomator libraries
+
+@RunWith(AndroidJUnit4.class)
public class UiAutomation extends BaseUiAutomation {
public static String TAG = "antutu";
@@ -41,7 +44,9 @@ public class UiAutomation extends BaseUiAutomation {
public static String TestButton6 = "com.antutu.ABenchMark:id/start_test_text";
private static int initialTimeoutSeconds = 20;
- public void runUiAutomation() throws Exception{
+@Test
+public void runUiAutomation() throws Exception{
+ initialize_instrumentation();
Bundle parameters = getParams();
String version = parameters.getString("version");
@@ -74,16 +79,15 @@ public class UiAutomation extends BaseUiAutomation {
hitTestButton();
hitTestButton();
}
- else
+ else {
hitTestButton();
+ }
- if(version.equals("6.0.1"))
- {
+ if(version.equals("6.0.1")) {
waitForVersion6Results();
extractResults6();
}
- else
- {
+ else {
waitForVersion4Results();
viewDetails();
extractResults();
@@ -101,12 +105,12 @@ public class UiAutomation extends BaseUiAutomation {
}
Bundle status = new Bundle();
- getAutomationSupport().sendStatus(Activity.RESULT_OK, status);
+ mInstrumentation.sendStatus(Activity.RESULT_OK, status);
}
public boolean dismissNewVersionNotificationIfNecessary() throws Exception {
UiSelector selector = new UiSelector();
- UiObject closeButton = new UiObject(selector.text("Cancel"));
+ UiObject closeButton = mDevice.findObject(selector.text("Cancel"));
if (closeButton.waitForExists(TimeUnit.SECONDS.toMillis(initialTimeoutSeconds))) {
closeButton.click();
sleep(1); // diaglog dismissal
@@ -118,7 +122,7 @@ public class UiAutomation extends BaseUiAutomation {
public boolean dismissReleaseNotesDialogIfNecessary() throws Exception {
UiSelector selector = new UiSelector();
- UiObject closeButton = new UiObject(selector.text("Close"));
+ UiObject closeButton = mDevice.findObject(selector.text("Close"));
if (closeButton.waitForExists(TimeUnit.SECONDS.toMillis(initialTimeoutSeconds))) {
closeButton.click();
sleep(1); // diaglog dismissal
@@ -130,7 +134,7 @@ public class UiAutomation extends BaseUiAutomation {
public boolean dismissRateDialogIfNecessary() throws Exception {
UiSelector selector = new UiSelector();
- UiObject closeButton = new UiObject(selector.text("NOT NOW"));
+ UiObject closeButton = mDevice.findObject(selector.text("NOT NOW"));
boolean dismissed = false;
// Sometimes, dismissing the dialog the first time does not work properly --
// it starts to disappear but is then immediately re-created; so may need to
@@ -145,7 +149,7 @@ public class UiAutomation extends BaseUiAutomation {
public void hitTestButton() throws Exception {
UiSelector selector = new UiSelector();
- UiObject test = new UiObject(selector.text("Test")
+ UiObject test = mDevice.findObject(selector.text("Test")
.className("android.widget.Button"));
test.waitForExists(initialTimeoutSeconds);
test.click();
@@ -156,7 +160,7 @@ public class UiAutomation extends BaseUiAutomation {
public void hitTestButtonVersion5(String id) throws Exception {
UiSelector selector = new UiSelector();
- UiObject test = new UiObject(selector.resourceId(id)
+ UiObject test = mDevice.findObject(selector.resourceId(id)
.className("android.widget.TextView"));
test.waitForExists(initialTimeoutSeconds);
test.click();
@@ -166,25 +170,25 @@ public class UiAutomation extends BaseUiAutomation {
public void hitTest() throws Exception {
UiSelector selector = new UiSelector();
- UiObject test = new UiObject(selector.text("Test"));
+ UiObject test = mDevice.findObject(selector.text("Test"));
test.click();
sleep(1); // possible tab transtion
}
public void disableSdCardTests() throws Exception {
UiSelector selector = new UiSelector();
- UiObject custom = new UiObject(selector.textContains("Custom"));
+ UiObject custom = mDevice.findObject(selector.textContains("Custom"));
custom.click();
sleep(1); // tab transition
- UiObject sdCardButton = new UiObject(selector.text("SD card IO"));
+ UiObject sdCardButton = mDevice.findObject(selector.text("SD card IO"));
sdCardButton.click();
}
public void hitStart() throws Exception {
UiSelector selector = new UiSelector();
Log.v(TAG, "Start the test");
- UiObject startButton = new UiObject(selector.text("Start Test")
+ UiObject startButton = mDevice.findObject(selector.text("Start Test")
.className("android.widget.Button"));
startButton.click();
}
@@ -195,10 +199,10 @@ public class UiAutomation extends BaseUiAutomation {
// details screen. So we have to wait for either and then act appropriatesl (on the barchart
// screen a back button press is required to get to the details screen.
UiSelector selector = new UiSelector();
- UiObject barChart = new UiObject(new UiSelector().className("android.widget.TextView")
- .text("Bar Chart"));
- UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
- .text("Details"));
+ UiObject barChart = mDevice.findObject(new UiSelector().className("android.widget.TextView")
+ .text("Bar Chart"));
+ UiObject detailsButton = mDevice.findObject(new UiSelector().className("android.widget.Button")
+ .text("Details"));
for (int i = 0; i < 60; i++) {
if (detailsButton.exists() || barChart.exists()) {
break;
@@ -207,15 +211,17 @@ public class UiAutomation extends BaseUiAutomation {
}
if (barChart.exists()) {
- getUiDevice().pressBack();
+ mDevice.pressBack();
}
}
public void waitForVersion6Results() throws Exception {
- UiObject qrText = new UiObject(new UiSelector().className("android.widget.TextView")
- .text("QRCode of result"));
+ UiObject qrText = mDevice.findObject(new UiSelector().className("android.widget.TextView")
+ .text("QRCode of result"));
+ UiObject testAgain = mDevice.findObject(new UiSelector().className("android.widget.TextView")
+ .resourceIdMatches(".*tv_score.*"));
for (int i = 0; i < 120; i++) {
- if (qrText.exists()) {
+ if (qrText.exists() || testAgain.exists()) {
break;
}
sleep(5);
@@ -224,14 +230,14 @@ public class UiAutomation extends BaseUiAutomation {
public void viewDetails() throws Exception {
UiSelector selector = new UiSelector();
- UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
- .text("Details"));
+ UiObject detailsButton = mDevice.findObject(new UiSelector().className("android.widget.Button")
+ .text("Details"));
detailsButton.clickAndWaitForNewWindow();
}
public void extractResults6() throws Exception {
//Overal result
- UiObject result = new UiObject(new UiSelector().resourceId("com.antutu.ABenchMark:id/tv_score_name"));
+ UiObject result = mDevice.findObject(new UiSelector().resourceId("com.antutu.ABenchMark:id/tv_score_name"));
if (result.exists()) {
Log.v(TAG, String.format("ANTUTU RESULT: Overall Score: %s", result.getText()));
}
@@ -245,7 +251,7 @@ public class UiAutomation extends BaseUiAutomation {
public void extractSectionResults6(String section) throws Exception {
UiSelector selector = new UiSelector();
- UiObject resultLayout = new UiObject(selector.resourceId("com.antutu.ABenchMark:id/hcf_" + section));
+ UiObject resultLayout = mDevice.findObject(selector.resourceId("com.antutu.ABenchMark:id/hcf_" + section));
UiObject result = resultLayout.getChild(selector.resourceId("com.antutu.ABenchMark:id/tv_score_value"));
if (result.exists()) {
@@ -262,7 +268,7 @@ public class UiAutomation extends BaseUiAutomation {
UiSelector selector = new UiSelector();
UiSelector resultTextSelector = selector.className("android.widget.TextView").index(0);
UiSelector relativeLayoutSelector = selector.className("android.widget.RelativeLayout").index(1);
- UiObject result = new UiObject(selector.className("android.widget.LinearLayout")
+ UiObject result = mDevice.findObject(selector.className("android.widget.LinearLayout")
.childSelector(relativeLayoutSelector)
.childSelector(resultTextSelector));
if (result.exists()) {
@@ -289,7 +295,7 @@ public class UiAutomation extends BaseUiAutomation {
UiSelector selector = new UiSelector();
for (int i = 1; i < 8; i += 2) {
- UiObject table = new UiObject(selector.className("android.widget.TableLayout").index(i));
+ UiObject table = mDevice.findObject(selector.className("android.widget.TableLayout").index(i));
for (int j = 0; j < 3; j += 2) {
UiObject row = table.getChild(selector.className("android.widget.TableRow").index(j));
UiObject metric = row.getChild(selector.className("android.widget.TextView").index(0));
@@ -307,23 +313,23 @@ public class UiAutomation extends BaseUiAutomation {
}
public void returnToTestScreen(String version) throws Exception {
- getUiDevice().pressBack();
+ mDevice.pressBack();
if (version.equals("5.3.0"))
{
UiSelector selector = new UiSelector();
- UiObject detailsButton = new UiObject(new UiSelector().className("android.widget.Button")
+ UiObject detailsButton = mDevice.findObject(new UiSelector().className("android.widget.Button")
.text("Details"));
sleep(1);
- getUiDevice().pressBack();
+ mDevice.pressBack();
}
}
public void testAgain() throws Exception {
UiSelector selector = new UiSelector();
- UiObject retestButton = new UiObject(selector.text("Test Again")
+ UiObject retestButton = mDevice.findObject(selector.text("Test Again")
.className("android.widget.Button"));
if (!retestButton.waitForExists(TimeUnit.SECONDS.toMillis(2))) {
- getUiDevice().pressBack();
+ mDevice.pressBack();
retestButton.waitForExists(TimeUnit.SECONDS.toMillis(2));
}
retestButton.clickAndWaitForNewWindow();
@@ -331,11 +337,11 @@ public class UiAutomation extends BaseUiAutomation {
public void waitForAndViewResults() throws Exception {
UiSelector selector = new UiSelector();
- UiObject submitTextView = new UiObject(selector.text("Submit Scores")
+ UiObject submitTextView = mDevice.findObject(selector.text("Submit Scores")
.className("android.widget.TextView"));
- UiObject detailTextView = new UiObject(selector.text("Detailed Scores")
+ UiObject detailTextView = mDevice.findObject(selector.text("Detailed Scores")
.className("android.widget.TextView"));
- UiObject commentTextView = new UiObject(selector.text("User comment")
+ UiObject commentTextView = mDevice.findObject(selector.text("User comment")
.className("android.widget.TextView"));
boolean foundResults = false;
for (int i = 0; i < 60; i++) {
@@ -351,25 +357,25 @@ public class UiAutomation extends BaseUiAutomation {
}
if (commentTextView.exists()) {
- getUiDevice().pressBack();
+ mDevice.pressBack();
}
// Yes, sometimes, it needs to be done twice...
if (commentTextView.exists()) {
- getUiDevice().pressBack();
+ mDevice.pressBack();
}
if (detailTextView.exists()) {
detailTextView.click();
sleep(1); // tab transition
- UiObject testTextView = new UiObject(selector.text("Test")
+ UiObject testTextView = mDevice.findObject(selector.text("Test")
.className("android.widget.TextView"));
if (testTextView.exists()) {
testTextView.click();
sleep(1); // tab transition
}
- UiObject scoresTextView = new UiObject(selector.text("Scores")
+ UiObject scoresTextView = mDevice.findObject(selector.text("Scores")
.className("android.widget.TextView"));
if (scoresTextView.exists()) {
scoresTextView.click();
diff --git a/wlauto/workloads/antutu/uiauto/build.gradle b/wlauto/workloads/antutu/uiauto/build.gradle
new file mode 100644
index 00000000..b78a0b86
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/build.gradle
@@ -0,0 +1,23 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.3.1'
+
+ // NOTE: Do not place your application dependencies here; they belong
+ // in the individual module build.gradle files
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}
diff --git a/wlauto/workloads/antutu/uiauto/build.sh b/wlauto/workloads/antutu/uiauto/build.sh
index 7cd2e7f0..2de72dc8 100755
--- a/wlauto/workloads/antutu/uiauto/build.sh
+++ b/wlauto/workloads/antutu/uiauto/build.sh
@@ -1,28 +1,40 @@
#!/bin/bash
-# Copyright 2013-2015 ARM Limited
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-class_dir=bin/classes/com/arm/wlauto/uiauto
-base_class=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', 'BaseUiAutomation.class')"`
-mkdir -p $class_dir
-cp $base_class $class_dir
-
-ant build
-
-if [[ -f bin/com.arm.wlauto.uiauto.antutu.jar ]]; then
- cp bin/com.arm.wlauto.uiauto.antutu.jar ..
+# CD into build dir if possible - allows building from any directory
+script_path='.'
+if `readlink -f $0 &>/dev/null`; then
+ script_path=`readlink -f $0 2>/dev/null`
+fi
+script_dir=`dirname $script_path`
+cd $script_dir
+
+# Ensure gradelw exists before starting
+if [[ ! -f gradlew ]]; then
+ echo 'gradlew file not found! Check that you are in the right directory.'
+ exit 9
+fi
+
+# Copy base class library from wlauto dist
+libs_dir=app/libs
+base_classes=`python -c "import os, wlauto; print os.path.join(os.path.dirname(wlauto.__file__), 'common', 'android', '*.aar')"`
+mkdir -p $libs_dir
+cp $base_classes $libs_dir
+
+# Build and return appropriate exit code if failed
+# gradle build
+./gradlew clean :app:assembleDebug
+exit_code=$?
+if [[ $exit_code -ne 0 ]]; then
+ echo "ERROR: 'gradle build' exited with code $exit_code"
+ exit $exit_code
+fi
+
+# If successful move APK file to workload folder (overwrite previous)
+package=com.arm.wlauto.uiauto.antutu
+rm -f ../$package
+if [[ -f app/build/apk/$package.apk ]]; then
+ cp app/build/apk/$package.apk ../$package.uiautoapk
+else
+ echo 'ERROR: UiAutomator apk could not be found!'
+ exit 9
fi
diff --git a/wlauto/workloads/antutu/uiauto/build.xml b/wlauto/workloads/antutu/uiauto/build.xml
deleted file mode 100644
index a649f2fd..00000000
--- a/wlauto/workloads/antutu/uiauto/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.jar b/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..13372aef
Binary files /dev/null and b/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties b/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..760fcce7
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed May 03 15:42:44 BST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/wlauto/workloads/antutu/uiauto/gradlew b/wlauto/workloads/antutu/uiauto/gradlew
new file mode 100755
index 00000000..9d82f789
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# 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
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+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`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ 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=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/wlauto/workloads/antutu/uiauto/gradlew.bat b/wlauto/workloads/antutu/uiauto/gradlew.bat
new file mode 100644
index 00000000..aec99730
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@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 Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz 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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/wlauto/workloads/antutu/uiauto/project.properties b/wlauto/workloads/antutu/uiauto/project.properties
deleted file mode 100644
index 4ab12569..00000000
--- a/wlauto/workloads/antutu/uiauto/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
diff --git a/wlauto/workloads/antutu/uiauto/settings.gradle b/wlauto/workloads/antutu/uiauto/settings.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/wlauto/workloads/antutu/uiauto/settings.gradle
@@ -0,0 +1 @@
+include ':app'