Revert "cmake: Build with r11c since r12 can't build static executabl…

…es (see: android/ndk#132)" This reverts commit 2e3dc6b.
chenxiaolong · Aug 28, 2016 · d1b8d7d · d1b8d7d
1 parent 5a5f235
commit d1b8d7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,11 +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")
-    elseif(ANDROID_NDK_RELEASE_NUM GREATER 12000 OR
-           ANDROID_NDK_RELEASE_NUM EQUAL 12000)
-        message(FATAL_ERROR "android-ndk r12 is broken for compiling static executables")
+    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
@@ -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)