summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2018-12-13 19:05:39 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2018-12-14 09:28:00 +0100
commit6729685b61edcc0d7e5f783b7659154a684b1e2b (patch)
tree01b79ea10f152221ba5188f559e3d21fcd99fdca
parentbbeec8dacb1a007ffadad391b63620b6d2575eb7 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-remove-assets.tar.gz
[android] - remove render test definitions from assetsupstream/tvn-remove-assets
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8f2c997297..e9a0e4e351 100644
--- a/Makefile
+++ b/Makefile
@@ -617,6 +617,8 @@ run-android-render-test-$1: $(BUILD_DEPS) platform/android/gradle/configuration.
adb pull "`adb shell 'printenv EXTERNAL_STORAGE' | tr -d '\r'`/mapbox/render" platform/android/build/render-test
# copy expected result and run pixelmatch
python platform/android/scripts/run-render-test.py
+ # remove test definitions from assets
+ rm -rf platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration
endef
@@ -753,7 +755,8 @@ clean:
./platform/android/MapboxGLAndroidSDK/.externalNativeBuild \
./platform/android/MapboxGLAndroidSDKTestApp/build \
./platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/activity/gen \
- ./platform/android/MapboxGLAndroidSDK/src/main/assets
+ ./platform/android/MapboxGLAndroidSDK/src/main/assets \
+ ./platform/android/MapboxGLAndroidSDKTestApp/src/main/assets/integration
.PHONY: distclean
distclean: clean