summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-04-25 15:11:01 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-04-25 15:11:01 +0200
commit9c20830661e264e3f1ffe8a50349b34f65cc0e5f (patch)
treedf735da51fd6ceb7c723d8e6de75de797adb6ec9
parenta87fd1a918df87c20f0fa14fb57c506f29d93d12 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-all-abi-target.tar.gz
[android] - add all abi targetupstream/tvn-all-abi-target
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dab827d77b..1ca3a732e5 100644
--- a/Makefile
+++ b/Makefile
@@ -462,6 +462,7 @@ MBGL_ANDROID_ABIS += arm-v8;arm64-v8a
MBGL_ANDROID_ABIS += x86;x86
MBGL_ANDROID_ABIS += x86-64;x86_64
MBGL_ANDROID_ABIS += mips;mips
+MBGL_ANDROID_ABIS += all;all
MBGL_ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests
MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64)
@@ -620,7 +621,7 @@ run-android-upload-archives: platform/android/configuration.gradle
# Runs Android UI tests on all connected devices using Spoon
.PHONY: run-android-ui-test-spoon
run-android-ui-test-spoon: platform/android/configuration.gradle
- cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis="$(MBGL_ANDROID_ACTIVE_ARCHS)" spoon
+ cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all spoon
.PHONY: test-code-android
test-code-android: