summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-06-01 15:28:22 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-06-01 17:37:01 -0700
commit8068424f3040b97b23e2e09a9279ebc221284c2e (patch)
tree6491a28f46bd0678eba064bf9bf5007a0205470f /Makefile
parent574dd144208466b9ed3c2e8bd102e04d833f6818 (diff)
downloadqtlocation-mapboxgl-8068424f3040b97b23e2e09a9279ebc221284c2e.tar.gz
[build] Add android-* make targets for specific ABIs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 26e9b58ec5..8911e0029e 100644
--- a/Makefile
+++ b/Makefile
@@ -163,13 +163,15 @@ build/android-$1/Makefile: platform/android/platform.gyp build/android-$1/config
android-lib-$1: build/android-$1/Makefile
$$(shell $(ANDROID_ENV) $1) $(MAKE) -j$(JOBS) -C build/android-$1 all
+android-$1: android-lib-$1
+ cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
+
apackage: android-lib-$1
endef
$(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi))))
-android: android-lib-arm-v7
- cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
+android: android-arm-v7
test-android:
cd platform/android && ./gradlew testReleaseUnitTest --continue