From 61ae48431646503a7f6b0f624ac36d35816e982b Mon Sep 17 00:00:00 2001 From: Sidharth Guglani Date: Thu, 14 Feb 2019 09:27:49 -0800 Subject: [PATCH] Pin cmake version to 3.6 Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/861 Reviewed By: davidaurelio Differential Revision: D14081865 Pulled By: SidharthGuglani fbshipit-source-id: 98bce25cfdd397f48beee64f114c85460b6d81fe --- java/build.gradle | 1 + scripts/android-setup.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/build.gradle b/java/build.gradle index 772886e0..8cded209 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -35,6 +35,7 @@ android { externalNativeBuild { cmake { path 'CMakeLists.txt' + version '3.6.0-rc2' } } diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh index 33b6e7a8..cca02112 100644 --- a/scripts/android-setup.sh +++ b/scripts/android-setup.sh @@ -55,5 +55,5 @@ function installAndroidSDK { echo > $ANDROID_HOME/licenses/android-sdk-license echo -n d56f5187479451eabf01fb78af6dfcb131a6481e > $ANDROID_HOME/licenses/android-sdk-license - installsdk 'build-tools;25.0.3' 'build-tools;26.0.2' 'platforms;android-25' 'platforms;android-26' 'ndk-bundle' 'extras;android;m2repository' + installsdk 'build-tools;25.0.3' 'build-tools;26.0.2' 'platforms;android-25' 'platforms;android-26' 'ndk-bundle' 'extras;android;m2repository' 'cmake;3.6.4111459' }