summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2016-10-04 13:19:11 +0200
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2016-10-05 12:15:15 +0200
commit93166aef482ea5835d87231f88d369449398ccdf (patch)
tree624b1a18893b0b4832f5dda259dbfd2a26427047 /Makefile
parent0ae25aa2ad86f4b7473d07e01c336c880ab61797 (diff)
downloadqtlocation-mapboxgl-93166aef482ea5835d87231f88d369449398ccdf.tar.gz
[android][build] always generate style sources on build
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index bdc00a42c1..20c4c0f260 100644
--- a/Makefile
+++ b/Makefile
@@ -447,9 +447,13 @@ test-node: node
ANDROID_ENV = platform/android/scripts/toolchain.sh
ANDROID_ABIS = arm-v5 arm-v7 arm-v8 x86 x86-64 mips
+.PHONY: style-code-android
+style-code-android: $(BUILD_DEPS)
+ node platform/android/scripts/generate-style-code.js
+
define ANDROID_RULES
-build/android-$1/$(BUILDTYPE): $(BUILD_DEPS)
+build/android-$1/$(BUILDTYPE): style-code-android
mkdir -p build/android-$1/$(BUILDTYPE)
build/android-$1/$(BUILDTYPE)/toolchain.cmake: platform/android/scripts/toolchain.sh build/android-$1/$(BUILDTYPE)
@@ -490,10 +494,6 @@ android-test-apk:
apackage:
cd platform/android && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
-.PHONY: style-code-android
-style-code-android:
- node platform/android/scripts/generate-style-code.js
-
.PHONY: android-generate-test
android-generate-test:
node platform/android/scripts/generate-test-code.js