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

Merge branch 'master' into resources-hook 

# Conflicts:
#	edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java
#	edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java
This commit is contained in:
solohsu 2019-04-24 11:11:05 +08:00
parent ae22d9839a 2bf1acf601
commit a325ebe255
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
edxp-sandhook/src/main/java/com/elderdrivers/riru/edxp/sandhook/config/SandHookProvider.java
View File

@ -6,7 +6,6 @@ import android.util.Log;
import com.elderdrivers.riru.edxp.Main;
import com.elderdrivers.riru.edxp.config.BaseHookProvider;
import com.elderdrivers.riru.edxp.deopt.PrebuiltMethodsDeopter;
import com.elderdrivers.riru.edxp.sandhook.dexmaker.DynamicBridge;
import com.swift.sandhook.xposedcompat.XposedCompat;
import com.swift.sandhook.xposedcompat.methodgen.SandHookXposedBridge;
@ -48,8 +47,13 @@ public class SandHookProvider extends BaseHookProvider {
}
@Override
public void deoptMethods(String packageName, ClassLoader classLoader) {
PrebuiltMethodsDeopter.deoptMethods(packageName, classLoader);
public Object findMethodNative(Class clazz, String methodName, String methodSig) {
return Main.findMethodNative(clazz, methodName, methodSig);
}
@Override
public void deoptMethodNative(Object method) {
Main.deoptMethodNative(method);
}
@Override

20
edxp-whale/src/main/java/com/elderdrivers/riru/edxp/whale/config/WhaleHookProvider.java
View File

@ -43,6 +43,16 @@ public class WhaleHookProvider extends BaseHookProvider {
return hookMethod;
}
@Override
public Object findMethodNative(Class clazz, String methodName, String methodSig) {
return Main.findMethodNative(clazz, methodName, methodSig);
}
@Override
public void deoptMethodNative(Object method) {
Main.deoptMethodNative(method);
}
@Override
public long getMethodId(Member member) {
return WhaleRuntime.getMethodSlot(member);
@ -57,14 +67,4 @@ public class WhaleHookProvider extends BaseHookProvider {
public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
Main.rewriteXmlReferencesNative(parserPtr, origRes, repRes);
}
@Override
public boolean initXResourcesNative() {
return Main.initXResourcesNative();
}
@Override
public void rewriteXmlReferencesNative(long parserPtr, XResources origRes, Resources repRes) {
Main.rewriteXmlReferencesNative(parserPtr, origRes, repRes);
}
}

10
edxp-yahfa/src/main/java/com/elderdrivers/riru/edxp/yahfa/config/YahfaHookProvider.java
View File

@ -29,6 +29,16 @@ public class YahfaHookProvider extends BaseHookProvider {
return DexMakerUtils.findMethodNative(hookMethod);
}
@Override
public Object findMethodNative(Class clazz, String methodName, String methodSig) {
return Main.findMethodNative(clazz, methodName, methodSig);
}
@Override
public void deoptMethodNative(Object method) {
Main.deoptMethodNative(method);
}
@Override
public boolean initXResourcesNative() {
return Main.initXResourcesNative();