diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2019-01-28 11:42:18 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-01-29 15:21:01 +0100 |
| commit | ca8625fba1bc86a42323236f27cb2c7f803a11c5 (patch) | |
| tree | 48c8be46fa4633994762a83b709ed8715f585f95 /Makefile | |
| parent | 472e61da39a3e01d8b7a482d8e5c4351c905055b (diff) | |
| download | qtlocation-mapboxgl-ca8625fba1bc86a42323236f27cb2c7f803a11c5.tar.gz | |
[android] revert modules vendorization and keep submodules only
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -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 |