diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-12-14 15:46:15 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-12-15 16:11:20 +0100 |
| commit | 13e7672f851fd5085104701e75550b93214dc7bf (patch) | |
| tree | 44f6fed31d69da4ee9c0bade6832c91870664277 /Makefile | |
| parent | 858854ba034e174d73ec1aa11f44c73c02296569 (diff) | |
| download | qtlocation-mapboxgl-13e7672f851fd5085104701e75550b93214dc7bf.tar.gz | |
[build] use 64 bit libdir + dalvikvm when running android tests on 64 bit platforms
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -472,6 +472,8 @@ test-node: node MBGL_ANDROID_ENV = platform/android/scripts/toolchain.sh MBGL_ANDROID_ABIS = arm-v5 arm-v7 arm-v8 x86 x86-64 mips MBGL_ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests +MBGL_ANDROID_LIBDIR = lib$(if $(filter arm-v8 x86-64,$1),64) +MBGL_ANDROID_DALVIKVM = dalvikvm$(if $(filter arm-v8 x86-64,$1),64,32) .PHONY: android-style-code android-style-code: @@ -530,7 +532,7 @@ run-android-core-test-$1: android-test-lib-$1 adb push build/android-$1/$(BUILDTYPE)/stripped/libmbgl-test.so $(MBGL_ANDROID_LOCAL_WORK_DIR) > /dev/null 2>&1 #Kick off the tests - adb shell "export LD_LIBRARY_PATH=/system/lib:$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && dalvikvm32 -cp $(MBGL_ANDROID_LOCAL_WORK_DIR)/test.jar Main" + adb shell "export LD_LIBRARY_PATH=/system/$(MBGL_ANDROID_LIBDIR):$(MBGL_ANDROID_LOCAL_WORK_DIR) && cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && $(MBGL_ANDROID_DALVIKVM) -cp $(MBGL_ANDROID_LOCAL_WORK_DIR)/test.jar Main" #Gather the results adb shell "cd $(MBGL_ANDROID_LOCAL_WORK_DIR) && tar -cvzf results.tgz test/fixtures/* > /dev/null 2>&1" |