From 8068424f3040b97b23e2e09a9279ebc221284c2e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 1 Jun 2016 15:28:22 -0700 Subject: [build] Add android-* make targets for specific ABIs --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.1