Add linker option -z global to libonnxruntime_providers_shared.so on …

…Android
microsoft · Dec 23, 2024 · 7f50558 · 7f50558
1 parent b707c46
commit 7f50558
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cmake/onnxruntime_providers_cpu.cmake b/cmake/onnxruntime_providers_cpu.cmake
@@ -238,9 +238,16 @@ if (NOT onnxruntime_MINIMAL_BUILD AND NOT onnxruntime_EXTENDED_MINIMAL_BUILD
   set_property(TARGET onnxruntime_providers_shared APPEND_STRING PROPERTY LINK_FLAGS "-Xlinker -exported_symbols_list ${ONNXRUNTIME_ROOT}/core/providers/shared/exported_symbols.lst")
   elseif(UNIX)
     if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "AIX")
-      target_link_options(onnxruntime_providers_shared PRIVATE
-                          "LINKER:--version-script=${ONNXRUNTIME_ROOT}/core/providers/shared/version_script.lds"
-                          "LINKER:--gc-sections")
+      if(CMAKE_SYSTEM_NAME STREQUAL "Android")
+        target_link_options(onnxruntime_providers_shared PRIVATE
+                            "LINKER:--version-script=${ONNXRUNTIME_ROOT}/core/providers/shared/version_script.lds"
+                            "LINKER:--gc-sections"
+                            "LINKER:-z,global")
+      else()
+        target_link_options(onnxruntime_providers_shared PRIVATE
+                            "LINKER:--version-script=${ONNXRUNTIME_ROOT}/core/providers/shared/version_script.lds"
+                            "LINKER:--gc-sections")
+      endif()
     endif()
   elseif(WIN32)
   set_property(TARGET onnxruntime_providers_shared APPEND_STRING PROPERTY LINK_FLAGS "-DEF:${ONNXRUNTIME_ROOT}/core/providers/shared/symbols.def")

diff --git a/cmake/onnxruntime_providers_qnn.cmake b/cmake/onnxruntime_providers_qnn.cmake
@@ -34,7 +34,7 @@
                           "LINKER:--version-script=${ONNXRUNTIME_ROOT}/core/providers/qnn/version_script.lds"
                           "LINKER:--gc-sections"
                           "LINKER:-rpath=\$ORIGIN"
-                          "LINKER:-u,_Provider_GetHost"
+                          "LINKER:-z,undefs"
       )
     else()
       target_link_options(onnxruntime_providers_qnn PRIVATE