From 149e83ba7608cdad43b1c0bda554aea97f936944 Mon Sep 17 00:00:00 2001 From: Michael Rennie Date: Fri, 7 Oct 2016 13:35:33 +0100 Subject: [PATCH] Set same default API level for ANDROID_ABI=armeabi-v7a as for arm64-v8a. Also switch to 32bit build by default, as almost all content is 32bit. --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dc119e2d..3bad68827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,12 @@ if(BUILD_ANDROID) CACHE STRING "The Android toolchain file") - # Default to arm64 if nothing is specified on the command line. - set(ANDROID_ABI "arm64-v8a" CACHE STRING "The Android ABI to build for") + # Set same default API level for ANDROID_ABI=armeabi-v7a as for arm64-v8a. + set( ANDROID_DEFAULT_NDK_API_LEVEL_arm 21 ) + + # Default to arm32 if nothing is specified on the command line. + # Options are {armeabi-v7a,arm64-v8a} + set(ANDROID_ABI "armeabi-v7a" CACHE STRING "The Android ABI to build for") # This will be overridden later, we just need to set it now so that the # configuration will continue on to where the toolchain is available