From 44996a76ce8eb6f528dee1fc2682a9b179b71cf9 Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Tue, 25 Jul 2023 14:58:33 +0800 Subject: [PATCH] [cmake]: Fix ndk r10d compile error Signed-off-by: Herman Chen Change-Id: I64fcf77e7adf13702f98d5d7735338846faff843 --- build/android/env_setup.sh | 2 +- osal/CMakeLists.txt | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build/android/env_setup.sh b/build/android/env_setup.sh index 7e34bb64..9c9b1776 100755 --- a/build/android/env_setup.sh +++ b/build/android/env_setup.sh @@ -74,7 +74,7 @@ FOUND_NDK=0 if [ -z "$ANDROID_NDK" ]; then # try find ndk path in CMakeCache.txt if [ -f "CMakeCache.txt" ]; then - ANDROID_NDK=`grep ANDROID_NDK CMakeCache.txt | awk -F '=' '{ print $2 }'` + ANDROID_NDK=`grep ANDROID_NDK\: CMakeCache.txt | awk -F '=' '{ print $2 }'` if [ -d "${ANDROID_NDK}" ]; then echo "use android ndk from CMakeCache.txt : ${ANDROID_NDK}" diff --git a/osal/CMakeLists.txt b/osal/CMakeLists.txt index 01acb9f2..e4d2b79e 100644 --- a/osal/CMakeLists.txt +++ b/osal/CMakeLists.txt @@ -86,7 +86,12 @@ set_target_properties(osal PROPERTIES FOLDER "osal") if(ANDROID) add_definitions(-static) # in Android pthread is in libc, also need liblog - target_link_libraries(osal log m) + # Android 14 requires libc++ not libstdc++ + if("${ANDROID_STL}" STREQUAL "c++_static") + target_link_libraries(osal log m) + else() + target_link_libraries(osal log stdc++ m) + endif() endif(ANDROID) # unit test