diff --git a/android/build.gradle b/android/build.gradle index 91f703e97..73037fa34 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,6 +16,7 @@ android { externalNativeBuild { cmake { + version CMAKE_VERSION arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' targets 'flipper', 'event', 'event_extra', 'event_core' } diff --git a/android/third-party/overrides/DoubleConversion/build.gradle b/android/third-party/overrides/DoubleConversion/build.gradle index b91309b88..104bd02ec 100644 --- a/android/third-party/overrides/DoubleConversion/build.gradle +++ b/android/third-party/overrides/DoubleConversion/build.gradle @@ -24,6 +24,7 @@ android { } externalNativeBuild { cmake { + version CMAKE_VERSION path './CMakeLists.txt' } } diff --git a/android/third-party/overrides/Folly/build.gradle b/android/third-party/overrides/Folly/build.gradle index 19ed9520b..7633b58fa 100644 --- a/android/third-party/overrides/Folly/build.gradle +++ b/android/third-party/overrides/Folly/build.gradle @@ -25,6 +25,7 @@ android { externalNativeBuild { cmake { path './CMakeLists.txt' + version CMAKE_VERSION } } diff --git a/android/third-party/overrides/LibEvent/build.gradle b/android/third-party/overrides/LibEvent/build.gradle index fbd796fb5..b8c809132 100644 --- a/android/third-party/overrides/LibEvent/build.gradle +++ b/android/third-party/overrides/LibEvent/build.gradle @@ -24,6 +24,7 @@ android { externalNativeBuild { cmake { path 'libevent-release-2.1.9/CMakeLists.txt' + version CMAKE_VERSION } } } diff --git a/android/third-party/overrides/RSocket/build.gradle b/android/third-party/overrides/RSocket/build.gradle index 3213ca342..1e3d430e3 100644 --- a/android/third-party/overrides/RSocket/build.gradle +++ b/android/third-party/overrides/RSocket/build.gradle @@ -24,7 +24,7 @@ android { externalNativeBuild { cmake { path './CMakeLists.txt' + version CMAKE_VERSION } } } -//'x86', 'x86_64', 'armeabi-v7a', diff --git a/android/third-party/overrides/glog/build.gradle b/android/third-party/overrides/glog/build.gradle index b91309b88..0c35cce6d 100644 --- a/android/third-party/overrides/glog/build.gradle +++ b/android/third-party/overrides/glog/build.gradle @@ -25,6 +25,7 @@ android { externalNativeBuild { cmake { path './CMakeLists.txt' + version CMAKE_VERSION } } } diff --git a/gradle.properties b/gradle.properties index 9c3e92c07..650558895 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,6 +14,8 @@ POM_DEVELOPER_NAME=facebook # Shared version numbers LITHO_VERSION=0.21.0 +CMAKE_VERSION="3.10.2" + # Gradle internals org.gradle.internal.repository.max.retries=10 org.gradle.internal.repository.initial.backoff=1250