From ca8625fba1bc86a42323236f27cb2c7f803a11c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Mon, 28 Jan 2019 11:42:18 +0100 Subject: [android] revert modules vendorization and keep submodules only --- Makefile | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 880abe1f99..15802768c6 100644 --- a/Makefile +++ b/Makefile @@ -517,13 +517,8 @@ 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: platform/android/vendor +platform/android/gradle/configuration.gradle: @printf "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@ define ANDROID_RULES @@ -763,11 +758,6 @@ endif android-configuration: platform/android/gradle/configuration.gradle cat platform/android/gradle/configuration.gradle -# Updates Android's vendor submodules -.PHONY: android-update-vendor -android-update-vendor: platform/android/gradle/configuration.gradle - cd platform/android && $(MBGL_ANDROID_GRADLE) -Pmapbox.abis=none updateVendorSubmodules - # Creates a dependency graph using Graphviz .PHONY: android-graph android-graph: platform/android/gradle/configuration.gradle -- cgit v1.2.1