From d8eb37df33b9613235aad659d7bc4fa386cf534e Mon Sep 17 00:00:00 2001 From: James Chen Date: Sat, 6 May 2023 09:17:01 +0800 Subject: [PATCH] Fix Release build missing -fvisiblity=hidden flag since new gradle version (7+) uses `RelWithDebInfo` BUILD type for android now. (#14976) --- native/cmake/predefine.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/native/cmake/predefine.cmake b/native/cmake/predefine.cmake index 98da6bfb6a..bffb8619a7 100644 --- a/native/cmake/predefine.cmake +++ b/native/cmake/predefine.cmake @@ -157,11 +157,15 @@ if(ANDROID) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -ffunction-sections -fdata-sections -fstrict-aliasing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -ffunction-sections -fdata-sections -fstrict-aliasing -frtti -fexceptions") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fvisibility=default -fno-omit-frame-pointer") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fvisibility=default -fno-omit-frame-pointer") - if(NOT DEFINED HIDE_SYMBOLS OR HIDE_SYMBOLS) # hidden by default - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fvisibility=hidden") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fvisibility=hidden -fvisibility-inlines-hidden") + + if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default -fno-omit-frame-pointer") + else() + if(NOT DEFINED HIDE_SYMBOLS OR HIDE_SYMBOLS) # hidden by default + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") + endif() endif() endif()