Add runtime_flags and service.sh arguments for late injection

Complicated modules, such as LSPosed / Vector, need to be inform about the injection mode, since many of their functions could reply on the exact launching sequence of system services.

Author: JingMatrix

loader/src/injector/module.cpp

@@ -320,13 +320,12 @@ void ZygiskContext::run_modules_post() {
         if (m.tryUnload()) modules_unloaded++;
     }
 
-    if (modules.size() > 0) {
+    if (modules.size() > 0 && g_hook != nullptr) {
         LOGV("modules unloaded: %zu/%zu", modules_unloaded, modules.size());
         if (modules.size() == modules_unloaded) clean_libc_trace();
         clean_linker_trace("jit-cache-zygisk", modules.size(), modules_unloaded, true);
-        if (g_hook != nullptr)
-            g_hook->should_spoof_maps =
-                (flags & APP_SPECIALIZE) && (modules.size() - modules_unloaded) > 0;
+        g_hook->should_spoof_maps =
+            (flags & APP_SPECIALIZE) && (modules.size() - modules_unloaded) > 0;
     }
 }
 

loader/src/injector/system_server.cpp

@@ -147,7 +147,7 @@ void trigger_system_server_hooks() {
     jint uid = static_cast<jint>(getuid());
     jint gid = static_cast<jint>(getgid());
     jintArray gids = fetch_gids(env);
-    jint runtime_flags = 0;
+    jint runtime_flags = RuntimeFlags::LATE_INJECT;
     jlong permitted_capabilities = 0;
     jlong effective_capabilities = 0;
 

loader/src/injector/system_server.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 /**
  * @brief Triggers Zygisk module hooks for system_server in late-injection scenarios.
  *
@@ -8,3 +9,9 @@
  * system_server_specialize.
  */
 void trigger_system_server_hooks();
+
+enum RuntimeFlags : uint32_t {
+    // Safely out of the way of AOSP's flags (Bits 0, 14-26)
+    // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/core/jni/com_android_internal_os_Zygote.cpp;
+    LATE_INJECT = 1 << 30,
+};

module/src/service.sh

@@ -9,20 +9,26 @@ fi
 
 cd "$MODDIR"
 
+system_server_pid=$(pidof system_server)
+
 if [ "$(which magisk)" ]; then
 	for file in ../*; do
 		if [ -d "$file" ] && [ -d "$file/zygisk" ] && ! [ -f "$file/disable" ]; then
 			if [ -f "$file/service.sh" ]; then
 				cd "$file"
 				log -p i -t "zygisk-sh" "Manually trigger service.sh for $file"
-				sh "$(realpath ./service.sh)" &
+				if [ -z $system_server_pid ]; then
+					sh "$(realpath ./service.sh)" &
+				else
+					sh "$(realpath ./service.sh)" --late-inject &
+				fi
 				cd "$MODDIR"
 			fi
 		fi
 	done
 fi
 
-if [ ! -z $(pidof system_server) ]; then
-	log -p i -t "zygisk-sh" "Maually inject into system_server $(pidof system_server)"
-	./bin/zygisk-ptrace64 trace $(pidof system_server) --system_server
+if [ ! -z $system_server_pid ]; then
+	log -p i -t "zygisk-sh" "Maually inject into system_server $system_server_pid"
+	./bin/zygisk-ptrace64 trace $system_server_pid --system_server
 fi