diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-07-26 12:42:39 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-07-26 12:48:58 +0200 |
| commit | 45372db4611562a51cd460f0c08bcc92338063b9 (patch) | |
| tree | f96234e76f42fc313d46267bc4bf5532569ab01c | |
| parent | 06761e507dd4e732ebd3180779c9868441f194a3 (diff) | |
| download | qtlocation-mapboxgl-45372db4611562a51cd460f0c08bcc92338063b9.tar.gz | |
[build] make android targets .PHONY and adhere to naming scheme
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | platform/android/bitrise.yml | 2 |
2 files changed, 8 insertions, 2 deletions
@@ -424,9 +424,11 @@ build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DMBGL_PLATFORM=android +.PHONY: android-lib-$1 android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile $(MAKE) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all +.PHONY: android-$1 android-$1: android-lib-$1 cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE) @@ -435,16 +437,20 @@ endef $(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi)))) +.PHONY: android android: android-arm-v7 -test-android: +.PHONY: android-test +android-test: cd platform/android && ./gradlew testReleaseUnitTest --continue +.PHONY: apackage apackage: cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE) #### Miscellaneous targets ##################################################### +.PHONY: style-code style-code: node scripts/generate-style-code.js diff --git a/platform/android/bitrise.yml b/platform/android/bitrise.yml index b7508f3836..149f4ac234 100644 --- a/platform/android/bitrise.yml +++ b/platform/android/bitrise.yml @@ -34,7 +34,7 @@ workflows: sudo apt-get install -y pkg-config nodejs cmake export BUILDTYPE=Release make android - make test-android + make android-test - slack: title: Post to Slack run_if: '{{enveq "SKIPCI" "false"}}' |