removed system_server and jni calls from frida-server for barebones A…

…ndroid systems
fpv-wtf · Mar 4, 2022 · 2711520 · 2711520
1 parent fa81117
commit 2711520
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 1,333 deletions.
diff --git a/lib/agent/agent-glue.c b/lib/agent/agent-glue.c
@@ -54,17 +54,3 @@ _frida_agent_environment_deinit (void)
   gum_internal_heap_unref ();
 #endif
 }
-
-#ifdef HAVE_ANDROID
-
-jint
-JNI_OnLoad (JavaVM * vm, void * reserved)
-{
-  FridaAgentBridgeState * state = reserved;
-
-  frida_agent_main (state->agent_parameters, &state->unload_policy, state->injector_state);
-
-  return JNI_VERSION_1_6;
-}
-
-#endif
diff --git a/lib/gadget/gadget.vala b/lib/gadget/gadget.vala
@@ -405,25 +405,6 @@ namespace Frida.Gadget {
 			);
 		}
 
-#if ANDROID
-		construct {
-			if (executable_name.has_prefix ("app_process")) {
-				try {
-					string cmdline;
-					FileUtils.get_contents ("/proc/self/cmdline", out cmdline);
-					if (cmdline != "zygote" && cmdline != "zygote64") {
-						executable_name = cmdline;
-
-						cached_bundle_id = cmdline.split (":", 2)[0];
-						cached_bundle_name = cached_bundle_id;
-						did_fetch_bundle_id = true;
-						did_fetch_bundle_name = true;
-					}
-				} catch (FileError e) {
-				}
-			}
-		}
-#endif
 
 		public string resolve_asset_path (string asset_path) {
 			if (!Path.is_absolute (asset_path)) {

diff --git a/lib/payload/fork-monitor.vala b/lib/payload/fork-monitor.vala
@@ -55,26 +55,6 @@ namespace Frida {
 
 			unowned Gum.InvocationListener listener = this;
 
-#if ANDROID
-			if (get_executable_path ().has_prefix ("/system/bin/app_process")) {
-				try {
-					string cmdline;
-					FileUtils.get_contents ("/proc/self/cmdline", out cmdline);
-					if (cmdline == "zygote" || cmdline == "zygote64" || cmdline == "usap32" || cmdline == "usap64") {
-						var set_argv0 = Gum.Module.find_export_by_name ("libandroid_runtime.so", "_Z27android_os_Process_setArgV0P7_JNIEnvP8_jobjectP8_jstring");
-						if (set_argv0 != null) {
-							interceptor.attach (set_argv0, listener, (void *) HookId.SET_ARGV0);
-							child_recovery_behavior = DEFERRED_UNTIL_SET_ARGV0;
-						}
-
-						var setcontext = Gum.Module.find_export_by_name ("libselinux.so", "selinux_android_setcontext");
-						if (setcontext != null)
-							interceptor.attach (setcontext, listener, (void *) HookId.SET_CTX);
-					}
-				} catch (FileError e) {
-				}
-			}
-#endif
 
 			interceptor.attach (fork_impl, listener, (void *) HookId.FORK);
 			interceptor.replace (vfork_impl, fork_impl);