Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Commit 1409085

Browse files
committed
[build] make android targets .PHONY and adhere to naming scheme
1 parent e46b580 commit 1409085

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -424,9 +424,11 @@ build/android-$1/$(BUILDTYPE)/Makefile: build/android-$1/$(BUILDTYPE)/toolchain.
424424
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
425425
-DMBGL_PLATFORM=android
426426

427+
.PHONY: android-lib-$1
427428
android-lib-$1: build/android-$1/$(BUILDTYPE)/Makefile
428429
$(MAKE) -j$(JOBS) -C build/android-$1/$(BUILDTYPE) all
429430

431+
.PHONY: android-$1
430432
android-$1: android-lib-$1
431433
cd platform/android && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
432434

@@ -435,16 +437,20 @@ endef
435437

436438
$(foreach abi,$(ANDROID_ABIS),$(eval $(call ANDROID_RULES,$(abi))))
437439

440+
.PHONY: android
438441
android: android-arm-v7
439442

440-
test-android:
443+
.PHONY: android-test
444+
android-test:
441445
cd platform/android && ./gradlew testReleaseUnitTest --continue
442446

447+
.PHONY: apackage
443448
apackage:
444449
cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
445450

446451
#### Miscellaneous targets #####################################################
447452

453+
.PHONY: style-code
448454
style-code:
449455
node scripts/generate-style-code.js
450456

platform/android/bitrise.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ workflows:
3434
sudo apt-get install -y pkg-config nodejs cmake
3535
export BUILDTYPE=Release
3636
make android
37-
make test-android
37+
make android-test
3838
- slack:
3939
title: Post to Slack
4040
run_if: '{{enveq "SKIPCI" "false"}}'

0 commit comments

Comments
 (0)