From 8d26faa94772472f6c64098b379e6caca4fbd429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= Date: Fri, 20 Dec 2024 08:33:44 +0100 Subject: [PATCH] Force API level on Android --- Library/TeamTalkLib/build/webrtc/CMakeLists.txt | 3 ++- Library/TeamTalkLib/build/webrtc/args.gn_android | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt index 99ce06e89..f966c9b36 100644 --- a/Library/TeamTalkLib/build/webrtc/CMakeLists.txt +++ b/Library/TeamTalkLib/build/webrtc/CMakeLists.txt @@ -188,6 +188,7 @@ else() message(WARNING "Unknown Android architecture") endif() + set (ANDROID_NDK_HOME $ENV{ANDROID_NDK_HOME}) configure_file(${CMAKE_CURRENT_LIST_DIR}/args.gn_android ${WEBRTC_INSTALL_ROOT}/args.gn @ONLY) elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -221,7 +222,7 @@ else() ) ExternalProject_Get_Property(depot-tools SOURCE_DIR) set (DEPOTTOOLS_DIR ${SOURCE_DIR}) - set (DEPOTTOOLS_EXPORT export PATH=$ENV{PATH}:${DEPOTTOOLS_DIR}) + set (DEPOTTOOLS_EXPORT export PATH=$ENV{PATH}:${DEPOTTOOLS_DIR} DEPOT_TOOLS_UPDATE=0) if (${CMAKE_SYSTEM_NAME} MATCHES "iOS") set (WEBRTC_REPO_NAME webrtc_ios) diff --git a/Library/TeamTalkLib/build/webrtc/args.gn_android b/Library/TeamTalkLib/build/webrtc/args.gn_android index cfec0a970..b04a24a70 100644 --- a/Library/TeamTalkLib/build/webrtc/args.gn_android +++ b/Library/TeamTalkLib/build/webrtc/args.gn_android @@ -21,3 +21,6 @@ target_cpu="@WEBRTC_ARCH@" target_os="android" treat_warnings_as_errors=false use_custom_libcxx=false +android_ndk_root="@ANDROID_NDK_HOME@" +android32_ndk_api_level=@ANDROID_PLATFORM_LEVEL@ +android64_ndk_api_level=@ANDROID_PLATFORM_LEVEL@