WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a debugging switch to enable instant modules loading

This commit is contained in:
solohsu 2019-01-29 23:40:59 +08:00
parent a362c984c9
commit a0d713715d
10 changed files with 49 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Bridge/src/main/java/com/elderdrivers/riru/xposed/Main.java
View File

@ -14,18 +14,21 @@ import static com.elderdrivers.riru.xposed.util.FileUtils.getDataPathPrefix;
@SuppressLint("DefaultLocale")
public class Main implements KeepAll {
// private static String sForkAndSpecializePramsStr = "";
// private static String sForkSystemServerPramsStr = "";
public static String sAppDataDir = "";
public static String sAppProcessName = "";
/**
* Whether do bootstrap hooking only once
*/
private static boolean sIsGlobalMode = false;
/**
* When set to true, install bootstrap hooks and loadModules
* for each process when it starts.
* This means you can deactivate or activate every module
* for the process you restart without rebooting.
*/
private static final boolean DYNAMIC_LOAD_MODULES = false;
// private static String sForkAndSpecializePramsStr = "";
// private static String sForkSystemServerPramsStr = "";
public static String sAppDataDir = "";
public static String sAppProcessName = "";
private static boolean sIsGlobalMode = false;
private static boolean sIsDynamicModules = false;
static {
init(Build.VERSION.SDK_INT);
@ -41,7 +44,8 @@ public class Main implements KeepAll {
int[][] rlimits, int mountExternal, String seInfo,
String niceName, int[] fdsToClose, int[] fdsToIgnore,
boolean startChildZygote, String instructionSet,
String appDataDir, boolean isGlobalMode) {
String appDataDir, boolean isGlobalMode,
boolean isDynamicModules) {
// sForkAndSpecializePramsStr = String.format(
// "Zygote#forkAndSpecialize(%d, %d, %s, %d, %s, %d, %s, %s, %s, %s, %s, %s, %s)",
// uid, gid, Arrays.toString(gids), debugFlags, Arrays.toString(rlimits),
@ -49,18 +53,25 @@ public class Main implements KeepAll {
// Arrays.toString(fdsToIgnore), startChildZygote, instructionSet, appDataDir);
sAppDataDir = appDataDir;
sIsGlobalMode = isGlobalMode;
if (!DYNAMIC_LOAD_MODULES && isGlobalMode) {
sIsDynamicModules = isDynamicModules;
if (isGlobalMode) {
Router.onProcessForked(false);
}
if (!sIsDynamicModules) {
Router.loadModulesSafely();
}
}
public static void forkAndSpecializePost(int pid, String appDataDir) {
// Utils.logD(sForkAndSpecializePramsStr + " = " + pid);
if (pid == 0) {
// in app process
if (DYNAMIC_LOAD_MODULES || !sIsGlobalMode) {
if (!sIsGlobalMode) {
Router.onProcessForked(false);
}
if (sIsDynamicModules) {
Router.loadModulesSafely();
}
} else {
// in zygote process, res is child zygote pid
// don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66
@ -80,6 +91,7 @@ public class Main implements KeepAll {
if (pid == 0) {
// in system_server process
Router.onProcessForked(true);
Router.loadModulesSafely();
} else {
// in zygote process, res is child zygote pid
// don't print log here, see https://github.com/RikkaApps/Riru/blob/77adfd6a4a6a81bfd20569c910bc4854f2f84f5e/riru-core/jni/main/jni_native_method.cpp#L55-L66

11
Bridge/src/main/java/com/elderdrivers/riru/xposed/entry/Router.java
View File

@ -16,14 +16,21 @@ public class Router {
// Initialize the Xposed framework and modules
try {
XposedInit.initForZygote(isSystem);
// FIXME some coredomain app can't reading modules.list
XposedInit.loadModules();
} catch (Throwable t) {
Utils.logE("Errors during Xposed initialization", t);
XposedBridge.disableHooks = true;
}
}
public static void loadModulesSafely() {
try {
// FIXME some coredomain app can't reading modules.list
XposedInit.loadModules();
} catch (Exception exception) {
Utils.logE("error loading module list", exception);
}
}
public static void startBootstrapHook(boolean isSystem) {
Utils.logD("startBootstrapHook starts: isSystem = " + isSystem);
ClassLoader classLoader = XposedBridge.BOOTCLASSLOADER;

2
Core/build.gradle
View File

@ -1,5 +1,5 @@
apply plugin: 'com.android.library'
version "v0.2.9.6_beta"
version "v0.2.9.7_beta"
extensions["module_name"] = "EdXposed"
android {
compileSdkVersion 28

10
Core/jni/main/inject/config_manager.cpp
View File

@ -17,14 +17,17 @@
#define WHITE_LIST_PATH "/data/misc/riru/modules/edxposed/whitelist/"
#define USE_WHITE_LIST "/data/misc/riru/modules/edxposed/usewhitelist"
#define GLOBAL_MODE "/data/misc/riru/modules/edxposed/forceglobal"
#define DYNAMIC_MODULES "/data/misc/riru/modules/edxposed/dynamicmodules"
static char package_name[256];
static bool global_mode = false;
static bool dynamic_modules = false;
static bool inited = false;
void initOnce() {
if (!inited) {
global_mode = access(GLOBAL_MODE, F_OK) == 0;
dynamic_modules = access(DYNAMIC_MODULES, F_OK) == 0;
inited = true;
}
}
@ -69,7 +72,12 @@ int is_app_need_hook(JNIEnv *env, jstring appDataDir) {
}
}
int is_global_mode() {
bool is_global_mode() {
initOnce();
return global_mode;
}
bool is_dynamic_modules() {
initOnce();
return dynamic_modules;
}

4
Core/jni/main/inject/config_manager.h
View File

@ -7,6 +7,8 @@
int is_app_need_hook(JNIEnv *env, jstring appDataDir);
int is_global_mode();
bool is_global_mode();
bool is_dynamic_modules();
#endif //EDXPOSED_CONFIG_MANAGER_H

4
Core/jni/main/inject/framework_hook.cpp
View File

@ -85,10 +85,10 @@ void onNativeForkAndSpecializePre(JNIEnv *env, jclass clazz,
}
prepareJavaEnv(env);
findAndCall(env, "forkAndSpecializePre",
"(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;Z)V",
"(II[II[[IILjava/lang/String;Ljava/lang/String;[I[IZLjava/lang/String;Ljava/lang/String;ZZ)V",
uid, gid, gids, runtime_flags, rlimits,
_mount_external, se_info, se_name, fdsToClose, fdsToIgnore,
is_child_zygote, instructionSet, appDataDir, is_global_mode());
is_child_zygote, instructionSet, appDataDir, is_global_mode(), is_dynamic_modules());
}
int onNativeForkAndSpecializePost(JNIEnv *env, jclass clazz, jint res) {

2
Core/template_override/config.sh
View File

@ -41,7 +41,7 @@ LATESTARTSERVICE=false
print_modname() {
ui_print "************************************"
ui_print " Riru - Ed Xposed v0.2.9.6 "
ui_print " Riru - Ed Xposed v0.2.9.7 "
ui_print "************************************"
}

2
Core/template_override/module.prop
View File

@ -1,6 +1,6 @@
id=riru_edxposed
name=Riru - Ed Xposed
version=v0.2.9.6_beta
version=v0.2.9.7_beta
versionCode=1
author=givein2u
description=Magisk version of Xposed. Require Riru - Core installed.

2
Core/template_override/riru_module.prop
View File

@ -1,5 +1,5 @@
name=Ed Xposed
version=v0.2.9.6_beta
version=v0.2.9.7_beta
versionCode=1
author=givein2u
description=Elder driver Xposed for Android Pie. Require Riru - Core installed.

2
Core/template_override/system/framework/edconfig.dex
View File

@ -1,4 +1,4 @@
version=90.0-0.2.9.6 (by Elder Driver)
version=90.0-0.2.9.7 (by Elder Driver)
arch=arm64
minsdk=23
maxsdk=28