diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-03-15 13:07:46 +0100 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-05-22 17:53:34 +0200 |
| commit | 60505b03174b5ec02ae723beafa7683f6ed54a62 (patch) | |
| tree | f54cac803f072f534ca46c3f21eb9971a1591f19 /Makefile | |
| parent | cce72e2d36c5efe53bb026a0d98f835d16440ffa (diff) | |
| download | qtlocation-mapboxgl-60505b03174b5ec02ae723beafa7683f6ed54a62.tar.gz | |
[android] - remove mips and armeabi as supported ABIs
[android] - bump CI image to NDK 17 compatible
[core] - remove setting edgeDistance to 0, comparison 'const short' > 32767 is always false
[android] - remove throwing in desructor, undefined behaviour
[android] - bump dependency versions of project
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -480,12 +480,10 @@ test-node-recycle-map: node #### Android targets ########################################################### -MBGL_ANDROID_ABIS = arm-v5;armeabi -MBGL_ANDROID_ABIS += arm-v7;armeabi-v7a +MBGL_ANDROID_ABIS = arm-v7;armeabi-v7a 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_LOCAL_WORK_DIR = /data/local/tmp/core-tests MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) @@ -626,7 +624,7 @@ run-android-unit-test-%: platform/android/gradle/configuration.gradle # Builds a release package of the Android SDK .PHONY: apackage apackage: platform/android/gradle/configuration.gradle - make android-lib-arm-v5 && make android-lib-arm-v7 && make android-lib-arm-v8 && make android-lib-x86 && make android-lib-x86-64 && make android-lib-mips + make android-lib-arm-v7 && make android-lib-arm-v8 && make android-lib-x86 && make android-lib-x86-64 cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=all assemble$(BUILDTYPE) # Build test app instrumentation tests apk and test app apk for all abi's |