From 52bc11892c0451f7bb19b788010231eae2f617f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Mon, 14 Jan 2019 16:44:48 +0100
Subject: [android] change vendor modules update script

---
 Makefile                      | 11 ++++++++---
 circle.yml                    |  6 ------
 platform/android/build.gradle |  2 +-
 3 files changed, 9 insertions(+), 10 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 #####################################################
diff --git a/circle.yml b/circle.yml
index 05d92e5558..68d17b774d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -531,9 +531,6 @@ jobs:
       MBGL_ANDROID_STL: << parameters.stl >>
     steps:
       - install-dependencies: { gradle: true }
-      - run:
-          name: Update vendor submodules
-          command: make android-update-vendor
       - run:
           name: Check code style
           command: make android-check
@@ -595,9 +592,6 @@ jobs:
       IS_LOCAL_DEVELOPMENT: false
     steps:
       - install-dependencies: { gradle: true }
-      - run:
-          name: Update vendor submodules
-          command: make android-update-vendor
       - run:
           name: Generate Maven credentials
           command: |
diff --git a/platform/android/build.gradle b/platform/android/build.gradle
index 9047bb5d96..b932188e77 100644
--- a/platform/android/build.gradle
+++ b/platform/android/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
     apply from: "${rootDir}/gradle/dependencies.gradle"
 
     repositories {
@@ -29,4 +30,3 @@ subprojects {
 // Load build system information. If this file does not exist, run
 // `make platform/android/gradle/configuration.gradle`
 apply from: "${rootDir}/gradle/configuration.gradle"
-apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle"
-- 
cgit v1.2.1