diff --git a/wlauto/commands/templates/uiauto_build_script b/wlauto/commands/templates/uiauto_build_script index f8ed3ef4..19081f8d 100644 --- a/wlauto/commands/templates/uiauto_build_script +++ b/wlauto/commands/templates/uiauto_build_script @@ -32,7 +32,7 @@ fi # If successful move APK file to workload folder (overwrite previous) rm -f ../$package_name if [[ -f app/build/apk/$package_name.apk ]]; then - cp app/build/apk/$package_name.apk ../$package_name.uiautoapk + cp app/build/apk/$package_name.apk ../$package_name.apk else echo 'ERROR: UiAutomator apk could not be found!' exit 9 diff --git a/wlauto/common/android/workload.py b/wlauto/common/android/workload.py index 232b10a3..222623d6 100755 --- a/wlauto/common/android/workload.py +++ b/wlauto/common/android/workload.py @@ -49,7 +49,7 @@ class UiAutomatorWorkload(Workload): This class should be subclassed by workloads that rely on android UiAutomator to work. This class handles installing the UI Automator APK to the device - and invoking it to run the workload. By default, it will look for the ``*.uiautoapk`` file + and invoking it to run the workload. By default, it will look for the ``*.apk`` file in the same directory as the .py file for the workload (this can be changed by overriding the ``uiauto_file`` property in the subclassing workload). diff --git a/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk b/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk index 6bc0f15d..b163fcfa 100644 Binary files a/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk and b/wlauto/workloads/applaunch/com.arm.wlauto.uiauto.applaunch.apk differ diff --git a/wlauto/workloads/applaunch/uiauto/app/src/main/java/com/arm/wlauto/uiauto/applaunch/UiAutomation.java b/wlauto/workloads/applaunch/uiauto/app/src/main/java/com/arm/wlauto/uiauto/applaunch/UiAutomation.java index 0de4c156..7daede8d 100755 --- a/wlauto/workloads/applaunch/uiauto/app/src/main/java/com/arm/wlauto/uiauto/applaunch/UiAutomation.java +++ b/wlauto/workloads/applaunch/uiauto/app/src/main/java/com/arm/wlauto/uiauto/applaunch/UiAutomation.java @@ -54,7 +54,7 @@ public void runUiAutomation() throws Exception{ // Get workload apk file parameters String workload = parameters.getString("workload"); String workloadAPKPath = parameters.getString("workdir"); - String workloadName = String.format("com.arm.wlauto.uiauto.%1s.uiautoapk",workload); + String workloadName = String.format("com.arm.wlauto.uiauto.%1s.apk",workload); String workloadAPKFile = String.format("%1s/%2s",workloadAPKPath, workloadName); // Load the apk file