diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-07-23 17:55:02 +0300 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-09-05 13:29:00 +0300 |
| commit | 5374723d4518f7e8ccd95115f70fa30d82c56e3c (patch) | |
| tree | 223842738fb3bbda4bd10da336ba43503c3edf39 | |
| parent | db5ac414f3744f5c35b19595cbd5780c53e2b4d8 (diff) | |
| download | qtlocation-mapboxgl-5374723d4518f7e8ccd95115f70fa30d82c56e3c.tar.gz | |
[build] Simplify Android cmake integration
CMake will detect that is building for Android automatically,
we don't need extra variables.
| -rw-r--r-- | platform/android/build.gradle | 6 | ||||
| -rw-r--r-- | platform/android/gradle/native-build.gradle | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 46666e2ef1..adc703ea55 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -31,8 +31,4 @@ allprojects { subprojects { apply from: "${rootDir}/gradle/dependencies.gradle" -} - -// Load build system information. If this file does not exist, run -// `make platform/android/gradle/configuration.gradle` -apply from: "${rootDir}/gradle/configuration.gradle"
\ No newline at end of file +}
\ No newline at end of file diff --git a/platform/android/gradle/native-build.gradle b/platform/android/gradle/native-build.gradle index 0c16c379dd..d9c4cda75a 100644 --- a/platform/android/gradle/native-build.gradle +++ b/platform/android/gradle/native-build.gradle @@ -40,19 +40,12 @@ ext.nativeBuild = { nativeTargets -> arguments "-DANDROID_TOOLCHAIN=clang" arguments "-DANDROID_STL=" + stl arguments "-DANDROID_CPP_FEATURES=exceptions" - arguments "-DMBGL_PLATFORM=android" - arguments "-DMASON_PLATFORM=android" - arguments "-DNodeJS_EXECUTABLE=" + node - arguments "-Dnpm_EXECUTABLE=" + npm // Enable ccache if the user has installed it. - if (ccache?.trim()) { - arguments "-DANDROID_CCACHE=" + ccache + if (file("/usr/bin/ccache").exists()) { + arguments "-DANDROID_CCACHE=/usr/bin/ccache" } - cFlags "-Qunused-arguments" - cppFlags "-Qunused-arguments" - for (target in nativeTargets) { targets target } |