diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2019-01-14 14:33:39 +0100 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-01-14 14:33:39 +0100 |
| commit | d0d5e494c91dccfd6e19ebf8bec3443f2eb8c470 (patch) | |
| tree | 607610c3b9db3ad20930345d12938ac6c4bde7bc | |
| parent | de4df2096f9b1c46f02d762c3b7ec45c8f373234 (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-vendorize-android-libs.tar.gz | |
[android] - make submodule initialisation part of configuration.gradle creationupstream/tvn-vendorize-android-libs
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | circle.yml | 6 | ||||
| -rw-r--r-- | platform/android/build.gradle | 3 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-update-vendor-modules.gradle | 3 |
4 files changed, 2 insertions, 12 deletions
@@ -519,7 +519,7 @@ style-code: android-style-code # 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}" > $@ + @echo "ext {\n node = '`command -v node || command -v nodejs`'\n npm = '`command -v npm`'\n ccache = '`command -v ccache`'\n}" > $@ && git submodule init && git submodule update define ANDROID_RULES # $1 = arm-v7 (short arch) diff --git a/circle.yml b/circle.yml index 05d92e5558..68d17b774d 100644 --- a/circle.yml +++ b/circle.yml @@ -532,9 +532,6 @@ jobs: steps: - install-dependencies: { gradle: true } - run: - name: Update vendor submodules - command: make android-update-vendor - - run: name: Check code style command: make android-check - run: @@ -596,9 +593,6 @@ jobs: steps: - install-dependencies: { gradle: true } - run: - name: Update vendor submodules - command: make android-update-vendor - - run: name: Generate Maven credentials command: | if [ -n "${PUBLISH_NEXUS_USERNAME}" ]; then diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 9047bb5d96..bf2a0a7871 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -28,5 +28,4 @@ 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" +apply from: "${rootDir}/gradle/configuration.gradle"
\ No newline at end of file diff --git a/platform/android/gradle/gradle-update-vendor-modules.gradle b/platform/android/gradle/gradle-update-vendor-modules.gradle deleted file mode 100644 index 2b8128d211..0000000000 --- a/platform/android/gradle/gradle-update-vendor-modules.gradle +++ /dev/null @@ -1,3 +0,0 @@ -task updateVendorSubmodules { - "git submodule update --init --recursive vendor".execute() -}
\ No newline at end of file |