diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-01 15:33:58 +0200 |
|---|---|---|
| committer | Ivo van Dongen <info@ivovandongen.nl> | 2016-07-07 10:08:45 +0200 |
| commit | 868bd7e3a77ddef1387795c29e6cee275362e63b (patch) | |
| tree | 27e3fa12b5b28e7ee059e00788fef6fbbd992186 | |
| parent | 2769a9db946c314c0f2f3fd2905cbfbcb69d0da9 (diff) | |
| download | qtlocation-mapboxgl-868bd7e3a77ddef1387795c29e6cee275362e63b.tar.gz | |
Revert "[android] #5456 - Add test for dx before using it."
This reverts commit 1fe98a608f1c17918f2208180bfd22b022e154c6.
| -rw-r--r-- | Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -167,7 +167,6 @@ idocument: ANDROID_ENV = platform/android/scripts/toolchain.sh ANDROID_ABIS = arm-v5 arm-v7 arm-v8 x86 x86-64 mips ANDROID_LOCAL_WORK_DIR = /data/local/tmp/core-tests -ANDROID_DX := $(shell command -v dx 2> /dev/null) define ANDROID_RULES build/android-$1/config.gypi: platform/android/scripts/configure.sh $(CONFIG_DEPENDENCIES) @@ -185,9 +184,6 @@ android-lib-$1: build/android-$1/Makefile cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) test-android-core-$1: android-test-lib-$1 - ifndef ANDROID_DX - $$(error "dx not found. Install android build tools (sdk) and make sure it's on the path") - # Compile main sources and extract the classes (using the test app to get all transitive dependencies in one place) cd platform/android && ./gradlew assembleDebug unzip -o platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk classes.dex -d build/android-$1 |