diff options
| author | Sven Gothel <[email protected]> | 2019-12-25 04:11:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-25 04:11:00 +0100 |
| commit | 44f5d564bacfd8adcbb1d59763ed8970667824af (patch) | |
| tree | 7243367a3381a71acda223e4853e389abf3d8feb /cmake | |
| parent | f344ef3aa3a42c4e81376c3d8ad6507ad2b8a20c (diff) | |
Bug 1417 - Android: OpenAL-Soft toolchain.android.cmake: ANDROID_API_LEVEL [21..22] only, link against c++_static!
NDK >= r19 using API > 22: 'U __register_atfork'
__register_atfork; # introduced=23
See <https://github.com/android/ndk/issues/964>
libc++_shared.so is not provided on device,
either link statically or deploy the shared library.
We link statically now.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/toolchain.android.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/cmake/toolchain.android.cmake b/cmake/toolchain.android.cmake index 5e5a7124..c2f5a708 100644 --- a/cmake/toolchain.android.cmake +++ b/cmake/toolchain.android.cmake @@ -7,7 +7,7 @@ # (gluegen/make/scripts/setenv-android-tools.sh env var) # - ANDROID_NDK := ${env.ANDROID_NDK} [/opt/android-sdk/ndk/20.00] # - ANDROID_HOST_TAG := ${env.ANDROID_HOST_TAG} [linux-x86_64, ..] -# - ANDROID_API_LEVEL := ${env.ANDROID_API_LEVEL} [24] +# - ANDROID_API_LEVEL := ${env.ANDROID_API_LEVEL} [21..22] # # and one of the following CPU target flags: # @@ -18,6 +18,10 @@ # - NDK_CPU_ARM # # (Will be preserved for try_compile() via CMAKE_TRY_COMPILE_PLATFORM_VARIABLES) +# +# NDK >= r19 using API > 22: 'U __register_atfork' +# __register_atfork; # introduced=23 +# See <https://github.com/android/ndk/issues/964> set(CMAKE_CROSSCOMPILING true) @@ -54,8 +58,8 @@ else() set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ${CMAKE_TRY_COMPILE_PLATFORM_VARIABLES} ANDROID_HOST_TAG) endif() -if(NOT ANDROID_API_LEVEL GREATER 2) - set(ANDROID_API_LEVEL 24) +if(NOT ANDROID_API_LEVEL GREATER 20) + set(ANDROID_API_LEVEL 22) message(STATUS "Using default android API level android-${ANDROID_API_LEVEL}") else() set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES ${CMAKE_TRY_COMPILE_PLATFORM_VARIABLES} ANDROID_API_LEVEL) @@ -133,7 +137,7 @@ set(CMAKE_FIND_ROOT_PATH "${ANDROID_NDK_TOOLCHAIN_ROOT}/bin" "${ANDROID_NDK_TOOL # Using llvm's c++_shared as of NDK r18: https://developer.android.com/ndk/guides/cpp-support.html # Also see https://github.com/android/ndk/issues/452 and https://gitlab.kitware.com/cmake/cmake/issues/17059 -set(ANDROID_STL "c++_shared") +set(ANDROID_STL "c++_static") set(STL_INCLUDE_PATH0 "${ANDROID_NDK_SYSROOT1}/usr/include/c++/v1") include_directories(BEFORE SYSTEM "${STL_INCLUDE_PATH0}") @@ -180,7 +184,7 @@ message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") message(STATUS "NDK_CPU_ARM: ${NDK_CPU_ARM}") message(STATUS "NDK_CPU_ARM64: ${NDK_CPU_ARM64}") -set(LINKER_FLAGS "--sysroot=${ANDROID_NDK_SYSROOT0} -L\"${ANDROID_NDK_SYSROOT1_LIB1}\" -Wl,-rpath-link=\"${ANDROID_NDK_SYSROOT1_LIB1}\" -L\"${ANDROID_NDK_SYSROOT1_LIB2}\" -target ${ANDROID_LLVM_TRIPLE}") +set(LINKER_FLAGS "--sysroot=${ANDROID_NDK_SYSROOT0} -L\"${ANDROID_NDK_SYSROOT1_LIB1}\" -Wl,-rpath-link=\"${ANDROID_NDK_SYSROOT1_LIB1}\" -L\"${ANDROID_NDK_SYSROOT1_LIB2}\" -target ${ANDROID_LLVM_TRIPLE} -static-libstdc++") #set(LINKER_FLAGS "${LINKER_FLAGS} -v") message(STATUS "ARM32_LINKER_OPTS: ${ARM32_LINKER_OPTS}") |