cmake: Remove unneeded -Wl,--allow-multiple-definition since libandro…

…id_support is no longer used Signed-off-by: Andrew Gunnerson <[email protected]>
Dark98 · Jul 3, 2018 · d369387 · d369387
1 parent c2cecab
commit d369387
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(
-Original file line number
+Diff line change
@@ Expand Up / @@ -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()
@@ Expand Down @@