diff --git a/bootimgtool/CMakeLists.txt b/bootimgtool/CMakeLists.txt index 757d511da..ec9568f68 100644 --- a/bootimgtool/CMakeLists.txt +++ b/bootimgtool/CMakeLists.txt @@ -49,7 +49,6 @@ foreach(variant ${variants}) ) endif() elseif(${variant} STREQUAL static) - android_link_allow_multiple_definitions(${bin_target}) unix_link_executable_statically(${bin_target}) endif() diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake index 14261008b..5aa84edcc 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake @@ -199,19 +199,6 @@ if(NOT MSVC) ) endif() -# https://github.com/android-ndk/ndk/issues/17 -function(android_link_allow_multiple_definitions first_target) - if(ANDROID AND "${ANDROID_STL}" STREQUAL "c++_static") - foreach(target "${first_target}" ${ARGN}) - set_property( - TARGET "${target}" - APPEND_STRING - PROPERTY LINK_FLAGS " -Wl,--allow-multiple-definition" - ) - endforeach() - endif() -endfunction() - function(unix_link_executable_statically first_target) if(UNIX) foreach(target "${first_target}" ${ARGN}) diff --git a/libmbbootimg/CMakeLists.txt b/libmbbootimg/CMakeLists.txt index 6fb365baf..228bb53a5 100644 --- a/libmbbootimg/CMakeLists.txt +++ b/libmbbootimg/CMakeLists.txt @@ -119,7 +119,6 @@ if(variants AND MBP_ENABLE_TESTS) ) if(ANDROID) - android_link_allow_multiple_definitions(mbbootimg_tests) unix_link_executable_statically(mbbootimg_tests) endif() diff --git a/libmbcommon/CMakeLists.txt b/libmbcommon/CMakeLists.txt index e9e4ebff0..5ca9104cd 100644 --- a/libmbcommon/CMakeLists.txt +++ b/libmbcommon/CMakeLists.txt @@ -167,7 +167,6 @@ if(variants AND MBP_ENABLE_TESTS) ) if(ANDROID) - android_link_allow_multiple_definitions(mbcommon_tests) unix_link_executable_statically(mbcommon_tests) endif() diff --git a/libmbdevice/CMakeLists.txt b/libmbdevice/CMakeLists.txt index 82cc48cf7..a8da1e6fc 100644 --- a/libmbdevice/CMakeLists.txt +++ b/libmbdevice/CMakeLists.txt @@ -130,7 +130,6 @@ if(variants AND MBP_ENABLE_TESTS) ) if(ANDROID) - android_link_allow_multiple_definitions(mbdevice_tests) unix_link_executable_statically(mbdevice_tests) endif() diff --git a/libmbsign/CMakeLists.txt b/libmbsign/CMakeLists.txt index 9107f76cd..7ac0366d3 100644 --- a/libmbsign/CMakeLists.txt +++ b/libmbsign/CMakeLists.txt @@ -78,7 +78,6 @@ if(variants AND MBP_ENABLE_TESTS) ) if(ANDROID) - android_link_allow_multiple_definitions(mbsign_tests) unix_link_executable_statically(mbsign_tests) endif() diff --git a/libmbsparse/CMakeLists.txt b/libmbsparse/CMakeLists.txt index 2b93bbd37..7ae63a7eb 100644 --- a/libmbsparse/CMakeLists.txt +++ b/libmbsparse/CMakeLists.txt @@ -78,7 +78,6 @@ if(variants AND MBP_ENABLE_TESTS) ) if(ANDROID) - android_link_allow_multiple_definitions(mbsparse_tests) unix_link_executable_statically(mbsparse_tests) endif() diff --git a/mbbootui/CMakeLists.txt b/mbbootui/CMakeLists.txt index 651ae15a5..429f3f185 100644 --- a/mbbootui/CMakeLists.txt +++ b/mbbootui/CMakeLists.txt @@ -59,7 +59,6 @@ target_include_directories( ${CMAKE_SOURCE_DIR}/external/flatbuffers/include ) -android_link_allow_multiple_definitions(mbbootui) unix_link_executable_statically(mbbootui) target_link_libraries( diff --git a/mbtool/CMakeLists.txt b/mbtool/CMakeLists.txt index be18a93b4..92b3512c8 100644 --- a/mbtool/CMakeLists.txt +++ b/mbtool/CMakeLists.txt @@ -142,7 +142,6 @@ if(${MBP_BUILD_TARGET} STREQUAL android-system) -DRECOVERY ) - android_link_allow_multiple_definitions(mbtool mbtool_recovery) unix_link_executable_statically(mbtool mbtool_recovery) target_link_libraries( diff --git a/odinupdater/CMakeLists.txt b/odinupdater/CMakeLists.txt index 551fc907b..703a80098 100644 --- a/odinupdater/CMakeLists.txt +++ b/odinupdater/CMakeLists.txt @@ -23,7 +23,6 @@ if(${MBP_BUILD_TARGET} STREQUAL android-system) Fuse::Fuse ) - android_link_allow_multiple_definitions(odinupdater fuse-sparse) unix_link_executable_statically(odinupdater fuse-sparse) install(