agent: Exclude OS/arch symbols in version script

Newer toolchains, such as the default toolchain on FreeBSD 14.2, don't like references to symbols that don't exist. Instead of listing JNI_OnLoad, which is only defined for Android builds, we use a separate version script for Android instead.
frida · Jan 9, 2025 · 7638290 · 7638290
1 parent 1e0f37f
commit 7638290
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/agent/frida-agent-android.version b/lib/agent/frida-agent-android.version
@@ -0,0 +1,8 @@
+{
+  global:
+    frida_agent_main;
+    JNI_OnLoad;
+
+  local:
+    *;
+};
diff --git a/lib/agent/frida-agent.version b/lib/agent/frida-agent.version
@@ -1,7 +1,6 @@
 {
   global:
     frida_agent_main;
-    JNI_OnLoad;
 
   local:
     *;

diff --git a/lib/agent/meson.build b/lib/agent/meson.build
@@ -28,7 +28,7 @@ if host_os_family == 'windows'
 elif host_os_family == 'darwin'
   extra_link_args += '-Wl,-exported_symbol,_frida_agent_main'
 else
-  symscript = 'frida-agent.version'
+  symscript = (host_os == 'android') ? 'frida-agent-android.version' : 'frida-agent.version'
   extra_link_args += '-Wl,--version-script,' + meson.current_source_dir() / symscript
   extra_link_depends += symscript
 endif