summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2019-01-14 16:44:48 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2019-01-15 14:21:26 +0100
commit52bc11892c0451f7bb19b788010231eae2f617f2 (patch)
tree130f59a68cd64f13e8533ac783304b6be93c4021 /Makefile
parent405aef0b47a805bad21ba96dd2419426cdc6bf25 (diff)
downloadqtlocation-mapboxgl-52bc11892c0451f7bb19b788010231eae2f617f2.tar.gz
[android] change vendor modules update script
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5d4508bb71..880abe1f99 100644
--- a/Makefile
+++ b/Makefile
@@ -517,9 +517,14 @@ android-style-code:
node platform/android/scripts/generate-style-code.js
style-code: android-style-code
+# Vendor submodules configuration for Android.
+.PHONY: platform/android/vendor
+platform/android/vendor:
+ git submodule update --init --recursive platform/android/vendor
+
# Configuration file for running CMake from Gradle within Android Studio.
-platform/android/gradle/configuration.gradle:
- @echo "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
+platform/android/gradle/configuration.gradle: platform/android/vendor
+ @printf "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@
define ANDROID_RULES
# $1 = arm-v7 (short arch)
@@ -765,7 +770,7 @@ android-update-vendor: platform/android/gradle/configuration.gradle
# Creates a dependency graph using Graphviz
.PHONY: android-graph
-android-graph:
+android-graph: platform/android/gradle/configuration.gradle
cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none :MapboxGLAndroidSDK:generateDependencyGraphMapboxLibraries
#### Miscellaneous targets #####################################################