From 1d97270241da9d804143f1d7bdd0fdb8b605c2ec Mon Sep 17 00:00:00 2001 From: Xiao-Long Chen Date: Thu, 23 Jun 2016 23:50:28 -0400 Subject: [PATCH] CMakeLists.txt: Require android-ndk r12+ --- CMakeLists.txt | 4 ++-- android/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a8567954..10e3c2166 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ endif() # Require at least Android NDK r11 if(${MBP_BUILD_TARGET} STREQUAL android-app OR ${MBP_BUILD_TARGET} STREQUAL android-system) - if(ANDROID_NDK_RELEASE_NUM LESS 11000) - message(FATAL_ERROR "Only android-ndk r11 or newer is supported") + if(ANDROID_NDK_RELEASE_NUM LESS 12000) + message(FATAL_ERROR "Only android-ndk r12 or newer is supported") endif() endif() diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 3de5efc2c..e95880ace 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -1,7 +1,7 @@ if(MBP_TOP_LEVEL_BUILD) include(ExternalProject) - set(ANDROID_TOOLCHAIN_VERSION clang3.6) + set(ANDROID_TOOLCHAIN_VERSION clang) set(ANDROID_ABIS armeabi-v7a arm64-v8a x86 x86_64) function(get_toolchain_name toolchain_var abi)