From 140908568b5e5759e888715e8795c11e7c64218c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Tue, 26 Jul 2016 12:42:39 +0200
Subject: [build] make android targets .PHONY and adhere to naming scheme

---
 Makefile                     | 8 +++++++-
 platform/android/bitrise.yml | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 25325612e0..62197bf624 100644
--- a/Makefile
+++ b/Makefile
@@ -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"}}'
-- 
cgit v1.2.1