From 586ae94ec4cfd3ea5b223ba36fc519ef8ada5eff Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 22 Feb 2017 17:55:12 +0100 Subject: [android] - uninstall current apk on test device before running a make run- command. (#8160) --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b350296689..30a5ade7ba 100644 --- a/Makefile +++ b/Makefile @@ -568,6 +568,7 @@ run-android-core-test-$1: run-android-core-test-$1-* .PHONY: run-android-$1 run-android-$1: android-$1 + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:install$(BUILDTYPE) && adb shell am start -n com.mapbox.mapboxsdk.testapp/.activity.FeatureOverviewActivity apackage: android-lib-$1 @@ -607,10 +608,12 @@ android-ui-test: .PHONY: run-android-ui-test run-android-ui-test: + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -i run-android-ui-test-%: - cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" + adb uninstall com.mapbox.mapboxsdk.testapp > /dev/null + cd platform/android && ./gradlew :MapboxGLAndroidSDKTestApp:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class="$*" .PHONY: run-android-ui-test-aws run-android-ui-test-aws: -- cgit v1.2.1