From b1d58751aaf466701c50a8a0eef53ae0e85a0e1c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 18 Sep 2025 10:54:21 +0200 Subject: [PATCH] [android] build without deprecated symbols --- CMakeLists.txt | 4 ---- include/config/config.h.in | 6 ++++++ scripts/android-build-freerdp.sh | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dcd3520d..61a7f00b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,10 +144,6 @@ if(WITH_FREERDP_3x_DEPRECATED) set(WITHOUT_FREERDP_3x_DEPRECATED OFF) endif() -if(WITHOUT_FREERDP_3x_DEPRECATED) - add_compile_definitions(WITHOUT_FREERDP_3x_DEPRECATED) -endif() - option(WITH_FREERDP_DEPRECATED_COMMANDLINE "Build FreeRDP deprecated command line options" OFF) if(WITH_FREERDP_DEPRECATED_COMMANDLINE) add_compile_definitions(WITH_FREERDP_DEPRECATED_COMMANDLINE) diff --git a/include/config/config.h.in b/include/config/config.h.in index 284a681ec..cf64c3143 100644 --- a/include/config/config.h.in +++ b/include/config/config.h.in @@ -227,4 +227,10 @@ */ #cmakedefine HAVE_AF_VSOCK_H +/** If library is build without these do permanently hide symbols + * + * \since version 3.17.2 + */ +#cmakedefine WITHOUT_FREERDP_3x_DEPRECATED + #endif /* FREERDP_CONFIG_H */ diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh index d1ae55f09..82033f541 100755 --- a/scripts/android-build-freerdp.sh +++ b/scripts/android-build-freerdp.sh @@ -102,6 +102,7 @@ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \ -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DFREERDP_EXTERNAL_PATH=$BUILD_DST \ + -DWITHOUT_FREERDP_3x_DEPRECATED=ON \ -DWITH_CLIENT_SDL=OFF \ -DWITH_SERVER=OFF \ -DWITH_INTERNAL_RC4=ON \