From 3b1830356095b2510e8cf779e7bdb99f0b9230ce Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 6 Dec 2018 04:44:12 -0800 Subject: [PATCH] Revert D13302768: [flipper] Upgrade to cmake 3.10.2 Differential Revision: D13302768 Original commit changeset: c38601659bde fbshipit-source-id: d624e51a489cd2d85288f85e13e09638e2ebb4be --- android/build.gradle | 1 - android/third-party/overrides/DoubleConversion/build.gradle | 1 - android/third-party/overrides/Folly/build.gradle | 1 - android/third-party/overrides/LibEvent/build.gradle | 1 - android/third-party/overrides/RSocket/build.gradle | 2 +- android/third-party/overrides/glog/build.gradle | 1 - gradle.properties | 2 -- 7 files changed, 1 insertion(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 73037fa34..91f703e97 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,7 +16,6 @@ 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 104bd02ec..b91309b88 100644 --- a/android/third-party/overrides/DoubleConversion/build.gradle +++ b/android/third-party/overrides/DoubleConversion/build.gradle @@ -24,7 +24,6 @@ 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 7633b58fa..19ed9520b 100644 --- a/android/third-party/overrides/Folly/build.gradle +++ b/android/third-party/overrides/Folly/build.gradle @@ -25,7 +25,6 @@ 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 b8c809132..fbd796fb5 100644 --- a/android/third-party/overrides/LibEvent/build.gradle +++ b/android/third-party/overrides/LibEvent/build.gradle @@ -24,7 +24,6 @@ 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 1e3d430e3..3213ca342 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 0c35cce6d..b91309b88 100644 --- a/android/third-party/overrides/glog/build.gradle +++ b/android/third-party/overrides/glog/build.gradle @@ -25,7 +25,6 @@ android { externalNativeBuild { cmake { path './CMakeLists.txt' - version CMAKE_VERSION } } } diff --git a/gradle.properties b/gradle.properties index 650558895..9c3e92c07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,8 +14,6 @@ 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