Merge pull request #408 from marcbonnici/next_uiauto2

Updated apk workload mechanism and support for uiautomator 2

.gitignore

@@ -3,6 +3,7 @@
 *.bak
 *.o
 *.cmd
+*.iml
 Module.symvers
 modules.order
 *~
@@ -20,4 +21,9 @@ pmu_logger.mod.c
 .tmp_versions
 obj/
 libs/armeabi
-uiauto/bin/
+**/uiauto/**/build/
+**/uiauto/**/.gradle
+**/uiauto/**/.idea
+**/uiauto/**/proguard-rules.pro
+**/uiauto/app/libs/
+**/uiauto/*.properties

wa/framework/configuration/core.py

@@ -20,7 +20,7 @@ from collections import OrderedDict, defaultdict
 from wa.framework.exception import ConfigError, NotFoundError
 from wa.framework.configuration.tree import SectionNode
 from wa.utils.misc import (get_article, merge_config_values)
-from wa.utils.types import (identifier, integer, boolean, list_of_strings, 
+from wa.utils.types import (identifier, integer, boolean, list_of_strings,
                             list_of, toggle_set, obj_dict, enum)
 from wa.utils.serializer import is_pod
 
@@ -520,9 +520,9 @@ class Configuration(object):
 
     def set(self, name, value, check_mandatory=True):
         if name not in self.configuration:
-            raise ConfigError('Unknown {} configuration "{}"'.format(self.name, 
+            raise ConfigError('Unknown {} configuration "{}"'.format(self.name,
                                                                      name))
-        self.configuration[name].set_value(self, value, 
+        self.configuration[name].set_value(self, value,
                                            check_mandatory=check_mandatory)
 
     def update_config(self, values, check_mandatory=True):
@@ -939,12 +939,11 @@ class JobSpec(Configuration):
             for name, cfg_point in cfg_points.iteritems():
                 if name in config:
                     value = config.pop(name)
-                    cfg_point.set_value(workload_params, value, 
+                    cfg_point.set_value(workload_params, value,
                                         check_mandatory=False)
             if config:
-                msg = 'conflicting entry(ies) for "{}" in {}: "{}"'
+                msg = 'Unexpected config "{}" for "{}"'
-                msg = msg.format(self.workload_name, source.name,
+                raise ConfigError(msg.format(config, self.workload_name))
-                                    '", "'.join(workload_params[source]))
 
         self.workload_parameters = workload_params
 
@@ -1042,7 +1041,7 @@ class JobGenerator(object):
                 sections.insert(0, ancestor)
 
             for workload_entry in workload_entries:
-                job_spec = create_job_spec(workload_entry, sections, 
+                job_spec = create_job_spec(workload_entry, sections,
                                            target_manager, self.plugin_cache,
                                            self.disabled_instruments)
                 if self.ids_to_run:

wa/framework/configuration/plugin_cache.py

@@ -54,7 +54,8 @@ class PluginCache(object):
 
     def add_source(self, source):
         if source in self.sources:
-            raise Exception("Source has already been added.")
+            msg = "Source '{}' has already been added."
+            raise Exception(msg.format(source))
         self.sources.append(source)
 
     def add_global_alias(self, alias, value, source):

wa/framework/resource.py

@@ -143,19 +143,28 @@ class ApkFile(Resource):
 
     kind = 'apk'
 
-    def __init__(self, owner, variant=None, version=None):
+    def __init__(self, owner, variant=None, version=None,
+                 package=None, uiauto=False):
         super(ApkFile, self).__init__(owner)
         self.variant = variant
         self.version = version
+        self.package = package
+        self.uiauto = uiauto
 
     def match(self, path):
         name_matches = True
         version_matches = True
+        package_matches = True
+        uiauto_matches = uiauto_test_matches(path, self.uiauto)
         if self.version is not None:
             version_matches = apk_version_matches(path, self.version)
         if self.variant is not None:
             name_matches = file_name_matches(path, self.variant)
-        return name_matches and version_matches
+        if self.package is not None:
+            package_matches = package_name_matches(path, self.package)
+        return name_matches and version_matches and \
+               uiauto_matches and package_matches
+
 
     def __str__(self):
         text = '<{}\'s apk'.format(self.owner)
@@ -163,6 +172,8 @@ class ApkFile(Resource):
             text += ' {}'.format(self.variant)
         if self.version:
             text += ' {}'.format(self.version)
+        if self.uiauto:
+            text += 'uiautomator test'
         text += '>'
         return text
 
@@ -216,7 +227,7 @@ class ResourceResolver(object):
     def load(self):
         for gettercls in self.loader.list_plugins('resource_getter'):
             self.logger.debug('Loading getter {}'.format(gettercls.name))
-            getter = self.loader.get_plugin(name=gettercls.name, 
+            getter = self.loader.get_plugin(name=gettercls.name,
                                             kind="resource_getter")
             log.indent()
             try:
@@ -271,3 +282,10 @@ def file_name_matches(path, pattern):
         return True
     return False
 
+def uiauto_test_matches(path, uiauto):
+    info = ApkInfo(path)
+    return uiauto == ('com.arm.wa.uiauto' in info.package)
+
+def package_name_matches(path, package):
+    info = ApkInfo(path)
+    return info.package == package

wa/framework/target/manager.py

@@ -9,6 +9,7 @@ from wa.framework.target.info import TargetInfo
 from wa.framework.target.runtime_parameter_manager import RuntimeParameterManager
 
 from devlib.utils.misc import memoized
+from devlib.exception import TargetError
 
 
 class TargetManager(object):
@@ -36,10 +37,15 @@ class TargetManager(object):
         self._init_target()
 
         # If target supports hotplugging, online all cpus before perform discovery
-        # and restore orignal configuration after completed.
+        # and restore original configuration after completed.
         if self.target.has('hotplug'):
             online_cpus = self.target.list_online_cpus()
-            self.target.hotplug.online_all()
+            try:
+                self.target.hotplug.online_all()
+            except TargetError:
+                msg = 'Failed to online all CPUS - some information may not be '\
+                      'able to be retrieved.'
+                self.logger.debug(msg)
             self.rpm = RuntimeParameterManager(self.target)
             all_cpus = set(range(self.target.number_of_cpus))
             self.target.hotplug.offline(*all_cpus.difference(online_cpus))

wa/framework/target/runtime_config.py

@@ -26,6 +26,7 @@ class RuntimeParameter(Parameter):
 
 class RuntimeConfig(Plugin):
 
+    name = None
     kind = 'runtime-config'
 
     @property
@@ -41,7 +42,12 @@ class RuntimeConfig(Plugin):
         self.target = target
         self._target_checked = False
         self._runtime_params = {}
-        self.initialize()
+        try:
+            self.initialize()
+        except TargetError:
+            msg = 'Failed to initialize: "{}"'
+            self.logger.debug(msg.format(self.name))
+            self._runtime_params = {}
 
     def initialize(self):
         raise NotImplementedError()

wa/framework/uiauto/app/build.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 25
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    compile fileTree(include: ['*.jar'], dir: 'libs')
+    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'
+}

wa/framework/uiauto/app/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.arm.wlauto.uiauto">
+
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+</manifest>

wa/framework/uiauto/app/src/main/java/com/arm/wa/uiauto/BaseUiAutomation.java

@@ -1,4 +1,4 @@
-/*    Copyright 2013-2015 ARM Limited
+/*    Copyright 2013-2016 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,49 +13,69 @@
  * limitations under the License.
 */
 
-
 package com.arm.wa.uiauto;
 
-import java.io.File;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.SystemClock;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.support.test.uiautomator.UiSelector;
+
+import org.junit.Before;
+import org.junit.Test;
+import static android.support.test.InstrumentationRegistry.getArguments;
+
+import android.os.Bundle;
+
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.InputStreamReader;
 import java.util.concurrent.TimeoutException;
 
-import android.app.Activity;
-import android.os.Bundle;
 
-// Import the uiautomator libraries
+public class BaseUiAutomation {
-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.testrunner.UiAutomatorTestCase;
 
-public class BaseUiAutomation extends UiAutomatorTestCase {   
+    public Instrumentation mInstrumentation;
+    public Context mContext;
+    public UiDevice mDevice;
 
+    @Before
+    public void initialize_instrumentation() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+        mContext = mInstrumentation.getTargetContext();
+    }
+
+    @Test
     public void setup() throws Exception {
     }
 
+    @Test
     public void runWorkload() throws Exception {
     }
 
+    @Test
     public void extractResults() throws Exception {
     }
 
+    @Test
     public void teardown() throws Exception {
     }
 
     public void sleep(int second) {
-        super.sleep(second * 1000);
+        SystemClock.sleep(second * 1000);
     }
 
     public boolean takeScreenshot(String name) {
-        Bundle params = getParams();
+        Bundle params = getArguments();
-	String png_dir = params.getString("workdir");
+        String png_dir = params.getString("workdir");
 
         try {
-            return getUiDevice().takeScreenshot(new File(png_dir, name + ".png"));
+            return mDevice.takeScreenshot(new File(png_dir, name + ".png"));
-        } catch(NoSuchMethodError e) {
+        } catch (NoSuchMethodError e) {
             return true;
         }
     }
@@ -66,8 +86,8 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
 
     public void waitText(String text, int second) throws UiObjectNotFoundException {
         UiSelector selector = new UiSelector();
-        UiObject text_obj = new UiObject(selector.text(text)
+        UiObject text_obj = mDevice.findObject(selector.text(text)
-                                       .className("android.widget.TextView"));
+                                                       .className("android.widget.TextView"));
         waitObject(text_obj, second);
     }
 
@@ -76,7 +96,7 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
     }
 
     public void waitObject(UiObject obj, int second) throws UiObjectNotFoundException {
-        if (! obj.waitForExists(second * 1000)){
+        if (!obj.waitForExists(second * 1000)) {
             throw new UiObjectNotFoundException("UiObject is not found: "
                     + obj.getSelector().toString());
         }
@@ -98,10 +118,10 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
 
         long currentTime = System.currentTimeMillis();
         boolean found = false;
-        while ((currentTime - startTime) < timeout){ 
+        while ((currentTime - startTime) < timeout) {
             sleep(2);  // poll every two seconds
 
-            while((line=reader.readLine())!=null) {
+            while ((line = reader.readLine()) != null) {
                 if (line.contains(searchText)) {
                     found = true;
                     break;
@@ -121,4 +141,3 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
         }
     }
 }
-

wa/framework/uiauto/build.gradle

@@ -0,0 +1,24 @@
+// 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.2'
+
+
+    // 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
+}

wa/framework/uiauto/build.sh

@@ -15,7 +15,18 @@
 #
 set -e
 
+# 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
 
-ant build
+# Build and return appropriate exit code if failed
+./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
 
-cp bin/classes/com/arm/wa/uiauto/BaseUiAutomation.class .
+cp app/build/outputs/aar/app-debug.aar ./uiauto.aar

wa/framework/uiauto/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.arm.wa.uiauto" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: VERSION_TAG -->
-    <import file="${sdk.dir}/tools/ant/uibuild.xml" />
-
-</project>

wa/framework/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

wa/framework/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 "$@"

wa/framework/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

wa/framework/uiauto/project.properties

@@ -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-17

wa/framework/uiauto/settings.gradle

@@ -0,0 +1 @@
+include ':app'

wa/framework/workload.py

@@ -14,8 +14,10 @@
 #
 import logging
 import os
+import re
 import time
 
+from wa import Parameter
 from wa.framework.plugin import TargetedPlugin
 from wa.framework.resource import (ApkFile, JarFile, ReventFile, NO_ONE,
                                    Executable, File)
@@ -24,6 +26,7 @@ from wa.utils.revent import ReventRecorder
 from wa.utils.exec_control import once
 
 from devlib.utils.android import ApkInfo
+from devlib.exception import TargetError
 
 
 class Workload(TargetedPlugin):
@@ -95,44 +98,123 @@ class Workload(TargetedPlugin):
     def __str__(self):
         return '<Workload {}>'.format(self.name)
 
-
+class ApkWorkload(Workload):
-class ApkUIWorkload(Workload):
 
     # May be optionally overwritten by subclasses
     # Times are in seconds
     loading_time = 10
+    package_names = []
+
+    parameters = [
+        Parameter('package', kind=str,
+                  description="""
+                  The pacakge name that can be used to specify
+                  the workload apk to use.
+                  """),
+        Parameter('install_timeout', kind=int,
+                  constraint=lambda x: x > 0,
+                  default=300,
+                  description="""
+                  Timeout for the installation of the apk.
+                  """),
+        Parameter('version', kind=str,
+                  default=None,
+                  description="""
+                  The version of the package to be used.
+                  """),
+        Parameter('variant', kind=str,
+                  default=None,
+                  description="""
+                  The variant of the package to be used.
+                  """),
+        Parameter('strict', kind=bool,
+                  default=False,
+                  description="""
+                  Whether to throw and error if the specified package cannot be found
+                  on host.
+                  """),
+        Parameter('force_install', kind=bool,
+                  default=False,
+                  description="""
+                  Always re-install the APK, even if matching version is found already installed
+                  on the device.
+                  """),
+        Parameter('uninstall', kind=bool,
+                  default=False,
+                  description="""
+                  If ``True``, will uninstall workload\'s APK as part of teardown.'
+                  """),
+    ]
 
     def __init__(self, target, **kwargs):
-        super(ApkUIWorkload, self).__init__(target, **kwargs)
+        super(ApkWorkload, self).__init__(target, **kwargs)
-        self.apk = None
+        self.apk = PackageHandler(self,
-        self.gui = None
+                                  package=self.package,
+                                  variant=self.variant,
+                                  strict=self.strict,
+                                  version=self.version,
+                                  force_install=self.force_install,
+                                  install_timeout=self.install_timeout,
+                                  uninstall=self.uninstall)
 
     def init_resources(self, context):
-        self.apk.init_resources(context.resolver)
+        pass
-        self.gui.init_resources(context.resolver)
-        self.gui.init_commands()
 
-    @once
     def initialize(self, context):
-        self.gui.deploy()
+        self.apk.initialize(context)
 
     def setup(self, context):
         self.apk.setup(context)
         time.sleep(self.loading_time)
-        self.gui.setup()
 
     def run(self, context):
-        self.gui.run()
+        pass
 
     def extract_results(self, context):
-        self.gui.extract_results()
+        pass
 
     def teardown(self, context):
-        self.gui.teardown()
         self.apk.teardown()
 
     @once
     def finalize(self, context):
+        pass
+
+
+class ApkUIWorkload(ApkWorkload):
+
+    def __init__(self, target, **kwargs):
+        super(ApkUIWorkload, self).__init__(target, **kwargs)
+        self.gui = None
+
+    def init_resources(self, context):
+        super(ApkUIWorkload, self).init_resources(context)
+        self.gui.init_resources(context.resolver)
+        self.gui.init_commands()
+
+    def initialize(self, context):
+        super(ApkUIWorkload, self).initialize(context)
+        self.gui.deploy()
+
+    def setup(self, context):
+        super(ApkUIWorkload, self).setup(context)
+        self.gui.setup()
+
+    def run(self, context):
+        super(ApkUIWorkload, self).run(context)
+        self.gui.run()
+
+    def extract_results(self, context):
+        super(ApkUIWorkload, self).extract_results(context)
+        self.gui.extract_results()
+
+    def teardown(self, context):
+        self.gui.teardown()
+        super(ApkUIWorkload, self).teardown(context)
+
+    @once
+    def finalize(self, context):
+        super(ApkUIWorkload, self).finalize(context)
         self.gui.remove()
 
 
@@ -142,7 +224,6 @@ class ApkUiautoWorkload(ApkUIWorkload):
 
     def __init__(self, target, **kwargs):
         super(ApkUiautoWorkload, self).__init__(target, **kwargs)
-        self.apk = ApkHander(self)
         self.gui = UiAutomatorGUI(self)
 
 
@@ -157,7 +238,7 @@ class ReventWorkload(ApkUIWorkload):
 
     def __init__(self, target, **kwargs):
         super(ReventWorkload, self).__init__(target, **kwargs)
-        self.apk = ApkHander(self)
+        self.apk = PackageHandler(self)
         self.gui = ReventGUI(self, target,
                              self.setup_timeout,
                              self.run_timeout,
@@ -169,6 +250,8 @@ class UiAutomatorGUI(object):
 
     stages = ['setup', 'runWorkload', 'extractResults', 'teardown']
 
+    uiauto_runner = 'android.support.test.runner.AndroidJUnitRunner'
+
     def __init__(self, owner, package=None, klass='UiAutomation', timeout=600):
         self.owner = owner
         self.target = self.owner.target
@@ -176,18 +259,15 @@ class UiAutomatorGUI(object):
         self.uiauto_class = klass
         self.timeout = timeout
         self.logger = logging.getLogger('gui')
-        self.jar_file = None
+        self.uiauto_file = None
-        self.target_jar_file = None
         self.commands = {}
         self.uiauto_params = {}
 
     def init_resources(self, resolver):
-        self.jar_file = resolver.get(JarFile(self.owner))
+        self.uiauto_file = resolver.get(ApkFile(self.owner, uiauto=True))
-        jar_name = os.path.basename(self.jar_file)
-        self.target_jar_file = self.target.get_workpath(jar_name)
         if not self.uiauto_package:
-            package = os.path.splitext(os.path.basename(self.jar_file))[0]
+            uiauto_info = ApkInfo(self.uiauto_file)
-            self.uiauto_package = package
+            self.uiauto_package = uiauto_info.package
 
     def init_commands(self):
         params_dict = self.uiauto_params
@@ -197,15 +277,16 @@ class UiAutomatorGUI(object):
             params += ' -e {} {}'.format(k, v)
 
         for stage in self.stages:
-            method_string = '{}.{}#{}'.format(self.uiauto_package,
+            class_string = '{}.{}#{}'.format(self.uiauto_package, self.uiauto_class,
-                                              self.uiauto_class,
+                                             stage)
-                                              stage)
+            instrumentation_string = '{}/{}'.format(self.uiauto_package,
-            cmd_template = 'uiautomator runtest {}{} -c {}'
+                                                    self.uiauto_runner)
-            self.commands[stage] = cmd_template.format(self.target_jar_file,
+            cmd_template = 'am instrument -w -r{} -e class {} {}'
-                                                       params, method_string)
+            self.commands[stage] = cmd_template.format(params, class_string,
+                                                       instrumentation_string)
 
     def deploy(self):
-        self.target.push(self.jar_file, self.target_jar_file)
+        self.target.install_apk(self.uiauto_file, replace=True)
 
     def set(self, name, value):
         self.uiauto_params[name] = value
@@ -232,7 +313,7 @@ class UiAutomatorGUI(object):
         self._execute('teardown', timeout or self.timeout)
 
     def remove(self):
-        self.target.remove(self.target_jar_file)
+        self.target.uninstall(self.uiauto_package)
 
     def _execute(self, stage, timeout):
         result = self.target.execute(self.commands[stage], timeout)
@@ -280,7 +361,7 @@ class ReventGUI(object):
         self.revent_teardown_file = resolver.get(resource=ReventFile(owner=self.workload,
                                                             stage='teardown',
                                                             target=self.target.model),
-                                                strict=False)
+                                                 strict=False)
 
     def deploy(self):
         self.revent_recorder.deploy()
@@ -333,16 +414,17 @@ class ReventGUI(object):
             self.target.push(self.revent_teardown_file, self.on_target_teardown_revent)
 
 
-class ApkHander(object):
+class PackageHandler(object):
 
     def __init__(self, owner, install_timeout=300, version=None, variant=None,
-                 strict=True, force_install=False, uninstall=False):
+                 package=None, strict=False, force_install=False, uninstall=False):
         self.logger = logging.getLogger('apk')
         self.owner = owner
         self.target = self.owner.target
         self.install_timeout = install_timeout
         self.version = version
         self.variant = variant
+        self.package = package
         self.strict = strict
         self.force_install = force_install
         self.uninstall = uninstall
@@ -351,49 +433,78 @@ class ApkHander(object):
         self.apk_version = None
         self.logcat_log = None
 
-    def init_resources(self, resolver):
+    def initialize(self, context):
-        self.apk_file = resolver.get(ApkFile(self.owner,
+        self.resolve_package(context)
-                                             variant=self.variant,
+        self.initialize_package(context)
-                                             version=self.version),
-                                             strict=self.strict)
-        self.apk_info = ApkInfo(self.apk_file)
 
     def setup(self, context):
-        self.initialize_package(context)
         self.start_activity()
         self.target.execute('am kill-all')  # kill all *background* activities
         self.target.clear_logcat()
 
+    def resolve_package(self, context):
+        self.apk_file = context.resolver.get(ApkFile(self.owner,
+                                                     variant=self.variant,
+                                                     version=self.version,
+                                                     package=self.package),
+                                             strict=self.strict)
+        if self.apk_file:
+            self.apk_info = ApkInfo(self.apk_file)
+        else:
+            if not self.owner.package_names and not self.package:
+                msg = 'No package name(s) specified and no matching APK file found on host'
+                raise WorkloadError(msg)
+            self.resolve_package_from_target(context)
+
+    def resolve_package_from_target(self, context):
+        if self.package:
+            if not self.target.package_is_installed(self.package):
+                msg = 'Package "{}" cannot be found on the host or device'
+            raise WorkloadError(msg.format(self.package))
+        else:
+            installed_versions = []
+            for package in self.owner.package_names:
+                if self.target.package_is_installed(package):
+                    installed_versions.append(package)
+
+            if self.version:
+                for package in installed_versions:
+                    if self.version == self.target.get_package_version(package):
+                        self.package = package
+                        break
+            else:
+                if len(installed_versions) == 1:
+                    self.package = installed_versions[0]
+                else:
+                    msg = 'Package version not set and multiple versions found on device'
+                    raise WorkloadError(msg)
+
+            if not self.package:
+                raise WorkloadError('No matching package found')
+
+        self.pull_apk(self.package)
+        self.apk_file = context.resolver.get(ApkFile(self.owner,
+                                                     variant=self.variant,
+                                                     version=self.version,
+                                                     package=self.package),
+                                             strict=self.strict)
+        self.apk_info = ApkInfo(self.apk_file)
+
     def initialize_package(self, context):
         installed_version = self.target.get_package_version(self.apk_info.package)
-        if self.strict:
-            self.initialize_with_host_apk(context, installed_version)
-        else:
-            if not installed_version:
-                message = '{} not found found on the device and check_apk is set '\
-                          'to "False" so host version was not checked.'
-                raise WorkloadError(message.format(self.apk_info.package))
-            message = 'Version {} installed on device; skipping host APK check.'
-            self.logger.debug(message.format(installed_version))
-            self.reset(context)
-            self.version = installed_version
-
-    def initialize_with_host_apk(self, context, installed_version):
         host_version = self.apk_info.version_name
         if installed_version != host_version:
             if installed_version:
                 message = '{} host version: {}, device version: {}; re-installing...'
-                self.logger.debug(message.format(os.path.basename(self.apk_file),
+                self.logger.debug(message.format(self.owner.name, host_version,
-                                                 host_version, installed_version))
+                                                 installed_version))
             else:
                 message = '{} host version: {}, not found on device; installing...'
-                self.logger.debug(message.format(os.path.basename(self.apk_file),
+                self.logger.debug(message.format(self.owner.name, host_version))
-                                                 host_version))
             self.force_install = True  # pylint: disable=attribute-defined-outside-init
         else:
             message = '{} version {} found on both device and host.'
-            self.logger.debug(message.format(os.path.basename(self.apk_file),
+            self.logger.debug(message.format(self.owner.name, host_version))
-                                             host_version))
         if self.force_install:
             if installed_version:
                 self.target.uninstall_package(self.apk_info.package)
@@ -427,6 +538,14 @@ class ApkHander(object):
         else:
             self.logger.debug(output)
 
+    def pull_apk(self, package):
+        if not self.target.package_is_installed(package):
+            message = 'Cannot retrieve "{}" as not installed on Target'
+            raise WorkloadError(message.format(package))
+        package_info = self.target.execute('pm list packages -f {}'.format(package))
+        apk_path = re.match('package:(.*)=', package_info).group(1)
+        self.target.pull(apk_path, self.owner.dependencies_directory)
+
     def teardown(self):
         self.target.execute('am force-stop {}'.format(self.apk_info.package))
         if self.uninstall:

wa/workloads/benchmarkpi/__init__.py

@@ -43,7 +43,7 @@ class BenchmarkPi(ApkUiautoWorkload):
     takes to run and complete the Pi calculation algorithm resulting in a
     approximation of the first Pi digits.
     """
-    package = 'gr.androiddev.BenchmarkPi'
+    package_names = ['gr.androiddev.BenchmarkPi']
     activity = '.BenchmarkPi'
 
     regex = re.compile('You calculated Pi in ([0-9]+)')

wa/workloads/benchmarkpi/uiauto/app/build.gradle

@@ -0,0 +1,35 @@
+apply plugin: 'com.android.application'
+
+def packageName = "com.arm.wa.uiauto.benchmarkpi"
+
+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'
+    }
+}

wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.arm.wlauto.uiauto.benchmarkpi"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+
+    <instrumentation
+        android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="${applicationId}"/>
+
+</manifest>
+

wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java

@@ -18,45 +18,46 @@ package com.arm.wa.uiauto.benchmarkpi;
 
 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.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.testrunner.UiAutomatorTestCase;
-
 import com.arm.wa.uiauto.BaseUiAutomation;
 
-public class UiAutomation extends BaseUiAutomation {   
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "benchmarkpi";
 
+    @Test
     public void runWorkload() throws Exception {
-	startTest();
+        startTest();
-	waitForResults();
+        waitForResults();
     }
 
+    @Test
     public void extractResults() throws Exception {
         UiSelector selector = new UiSelector();
-        UiObject resultsText = new UiObject(selector.textContains("You calculated Pi in")
+        UiObject resultsText = mDevice.findObject(selector.textContains("You calculated Pi in")
-                                                    .className("android.widget.TextView"));
+                .className("android.widget.TextView"));
-	Log.v(TAG, resultsText.getText());
+        Log.v(TAG, resultsText.getText());
     }
 
     public void startTest() throws Exception{
         UiSelector selector = new UiSelector();
-        UiObject benchButton = new UiObject(selector.text("Benchmark my Android!")
+        UiObject benchButton = mDevice.findObject(selector.text("Benchmark my Android!")
-                                                    .className("android.widget.Button"));
+                                                          .className("android.widget.Button"));
         benchButton.click();
     }
 
     public void waitForResults() throws Exception{
         UiSelector selector = new UiSelector();
-        UiObject submitButton = new UiObject(selector.text("Submit")
+        UiObject submitButton = mDevice.findObject(selector.text("Submit")
-                                                     .className("android.widget.Button"));
+                                                           .className("android.widget.Button"));
-	submitButton.waitForExists(10 * 1000);
+        submitButton.waitForExists(10 * 1000);
     }
-
 }

wa/workloads/benchmarkpi/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.2'
+
+        // 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
+}

wa/workloads/benchmarkpi/uiauto/build.sh

@@ -15,13 +15,41 @@
 #
 set -e
 
-class_dir=bin/classes/com/arm/wa/uiauto
+# CD into build dir if possible - allows building from any directory
-base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'BaseUiAutomation.class')"`
+script_path='.'
-mkdir -p $class_dir
+if `readlink -f $0 &>/dev/null`; then
-cp $base_class $class_dir
+    script_path=`readlink -f $0 2>/dev/null`
-
+fi
-ant build
+script_dir=`dirname $script_path`
-
+cd $script_dir
-if [[ -f bin/com.arm.wa.uiauto.benchmarkpi.jar ]]; then
+
-    cp bin/com.arm.wa.uiauto.benchmarkpi.jar ..
+# 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_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"`
+mkdir -p $libs_dir
+cp $base_class $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.wa.uiauto.benchmarkpi
+rm -f ../$package
+if [[ -f app/build/apk/$package.apk ]]; then
+    cp app/build/apk/$package.apk ../$package.apk
+else
+    echo 'ERROR: UiAutomator apk could not be found!'
+    exit 9
 fi

wa/workloads/benchmarkpi/uiauto/build.xml

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="com.arm.wa.uiauto.benchmarkpi" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: VERSION_TAG -->
-    <import file="${sdk.dir}/tools/ant/uibuild.xml" />
-
-</project>

wa/workloads/benchmarkpi/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

wa/workloads/benchmarkpi/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 "$@"

wa/workloads/benchmarkpi/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

wa/workloads/benchmarkpi/uiauto/project.properties

@@ -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-17

wa/workloads/benchmarkpi/uiauto/settings.gradle

@@ -0,0 +1 @@
+include ':app'