Refactor project structure

Author: solohsu

Diff for: Bridge/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong

Diff for: README.md

@@ -1,5 +1,4 @@
-import org.gradle.internal.os.OperatingSystem;
-
+import org.gradle.internal.os.OperatingSystem
 apply plugin: 'com.android.library'
 version "v0.3.1.6_beta-SNAPSHOT"
 extensions["module_name"] = "EdXposed"
@@ -28,12 +27,12 @@ afterEvaluate {
         def nameCapped = variant.name.capitalize()
         def nameLowered = variant.name.toLowerCase()
 
-        def zipTask = task("zip${nameCapped}", type: Exec, dependsOn: ":Bridge:makeAndCopy${nameCapped}") {
+        def zipTask = task("zip${nameCapped}", type: Exec, dependsOn: ":edxp-yahfa:makeAndCopy${nameCapped}") {
             workingDir '..'
-            commandLine 'sh', 'build.sh',   \
-                       project.name,   \
-                       "${project.version}-${nameLowered}",   \
-                       "${project.extensions['module_name']}"
+            commandLine 'sh', 'build.sh',    \
+                        project.name,    \
+                        "${project.version}-${nameLowered}",    \
+                        "${project.extensions['module_name']}"
         }
 
         def pushTask = task("push${nameCapped}", type: Exec) {
@@ -51,3 +50,6 @@ afterEvaluate {
     }
 
 }
+
+dependencies {
+}

Diff for: build.gradle

@@ -0,0 +1,61 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId "com.elderdrivers.riru.edxp.yahfa"
+        minSdkVersion 26
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    compileOnly files("libs/framework-stub.jar")
+    implementation project(':xposed-bridge')
+    compileOnly project(':dexmaker')
+}
+
+
+preBuild.doLast {
+    def imlFile = file(project.name + ".iml")
+    println 'Change ' + project.name + '.iml order'
+    try {
+        def parsedXml = (new groovy.util.XmlParser()).parse(imlFile)
+        def jdkNode = parsedXml.component[1].orderEntry.find { it.'@type' == 'jdk' }
+        parsedXml.component[1].remove(jdkNode)
+        def sdkString = "Android API " + android.compileSdkVersion.substring("android-".length()) + " Platform"
+        new groovy.util.Node(parsedXml.component[1], 'orderEntry', ['type': 'jdk', 'jdkName': sdkString, 'jdkType': 'Android SDK'])
+        groovy.xml.XmlUtil.serialize(parsedXml, new FileOutputStream(imlFile))
+    } catch (FileNotFoundException e) {
+        // nop, iml not found
+    }
+}
+
+afterEvaluate {
+
+    tasks.withType(JavaCompile) {
+        options.compilerArgs.add("-Xbootclasspath/p:${projectDir.absolutePath}/libs/framework-stub.jar")
+    }
+
+    android.applicationVariants.all { variant ->
+        def nameCapped = variant.name.capitalize()
+        def nameLowered = variant.name.toLowerCase()
+
+        def makeAndCopyTask = task("makeAndCopy${nameCapped}", type: Jar, dependsOn: "assemble${nameCapped}") {
+            from "build/intermediates/dex/${nameLowered}/mergeDex${nameCapped}/out/"
+            destinationDir file("../edxp-core/template_override/system/framework/")
+            baseName "edxp"
+        }
+    }
+}

Diff for: Core/.gitignore renamed to edxp-core/.gitignore

@@ -0,0 +1 @@
+<manifest package="com.elderdrivers.riru.edxp.yahfa" />

Diff for: Core/build-module.sh renamed to edxp-core/build-module.sh

@@ -11,6 +11,7 @@
 import java.util.List;
 
 import dalvik.system.PathClassLoader;
+import de.robv.android.xposed.XposedHelpers;
 
 public class ClassLoaderUtils {
 
@@ -91,7 +92,7 @@ public static boolean addPathToClassLoader(ClassLoader classLoader) {
         try {
             PathClassLoader baseDexClassLoader = (PathClassLoader) classLoader;
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                baseDexClassLoader.addDexPath(DEXPATH);
+                XposedHelpers.callMethod(baseDexClassLoader, "addDexPath", DEXPATH);
             } else {
                 DexUtils.injectDexAtFirst(DEXPATH, baseDexClassLoader);
             }

Diff for: Core/build.gradle renamed to edxp-core/build.gradle

@@ -7,6 +7,7 @@
 import com.elderdrivers.riru.common.KeepAll;
 import com.elderdrivers.riru.edxp.BuildConfig;
 import com.elderdrivers.riru.edxp.yahfa.core.HookMethodResolver;
+import com.elderdrivers.riru.edxp.yahfa.entry.Router;
 import com.elderdrivers.riru.edxp.yahfa.proxy.BlackWhiteListProxy;
 import com.elderdrivers.riru.edxp.yahfa.proxy.NormalProxy;
 import com.elderdrivers.riru.edxp.util.Utils;
@@ -26,6 +27,7 @@ public class Main implements KeepAll {
     static {
         init(Build.VERSION.SDK_INT);
         HookMethodResolver.init();
+        Router.injectConfig();
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////////

Diff for: Core/jni/.gitattributes renamed to edxp-core/jni/.gitattributes

@@ -0,0 +1,23 @@
+package com.elderdrivers.riru.edxp.yahfa.config;
+
+import com.elderdrivers.riru.edxp.config.EdXpConfig;
+import com.elderdrivers.riru.edxp.config.InstallerChooser;
+import com.elderdrivers.riru.edxp.yahfa.Main;
+import com.elderdrivers.riru.edxp.yahfa.entry.hooker.XposedBlackListHooker;
+
+public class YahfaEdxpConfig implements EdXpConfig {
+    @Override
+    public String getInstallerBaseDir() {
+        return InstallerChooser.INSTALLER_DATA_BASE_DIR;
+    }
+
+    @Override
+    public String getBlackListModulePackageName() {
+        return XposedBlackListHooker.BLACK_LIST_PACKAGE_NAME;
+    }
+
+    @Override
+    public boolean isDynamicModulesMode() {
+        return Main.isDynamicModulesEnabled();
+    }
+}

Diff for: Core/jni/Android.mk renamed to edxp-core/jni/Android.mk

@@ -0,0 +1,33 @@
+package com.elderdrivers.riru.edxp.yahfa.config;
+
+import com.elderdrivers.riru.edxp.hook.HookProvider;
+import com.elderdrivers.riru.edxp.util.PrebuiltMethodsDeopter;
+import com.elderdrivers.riru.edxp.yahfa.dexmaker.DexMakerUtils;
+import com.elderdrivers.riru.edxp.yahfa.dexmaker.DynamicBridge;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
+
+import de.robv.android.xposed.XposedBridge;
+
+public class YahfaHookProvider implements HookProvider {
+    @Override
+    public void hookMethod(Member method, XposedBridge.AdditionalHookInfo additionalInfo) {
+        DynamicBridge.hookMethod(method, additionalInfo);
+    }
+
+    @Override
+    public Object invokeOriginalMethod(Member method, Object thisObject, Object[] args) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+        return DynamicBridge.invokeOriginalMethod(method, thisObject, args);
+    }
+
+    @Override
+    public Member findMethodNative(Member hookMethod) {
+        return DexMakerUtils.findMethodNative(hookMethod);
+    }
+
+    @Override
+    public void deoptMethods(String packageName, ClassLoader classLoader) {
+        PrebuiltMethodsDeopter.deoptMethods(packageName, classLoader);
+    }
+}

Diff for: Core/jni/Application.mk renamed to edxp-core/jni/Application.mk

@@ -3,10 +3,13 @@
 import android.app.AndroidAppHelper;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.elderdrivers.riru.edxp.yahfa.Main;
 import com.elderdrivers.riru.edxp.config.ConfigManager;
+import com.elderdrivers.riru.edxp.yahfa.core.HookMain;
 
+import java.lang.reflect.Member;
 import java.security.MessageDigest;
 import java.util.HashMap;
 import java.util.Map;
@@ -243,4 +246,17 @@ public static String getSha1Hex(String text) {
         }
         return "";
     }
+
+    public static Member findMethodNative(Member hookMethod) {
+        MethodInfo methodInfo = new MethodInfo(hookMethod);
+        Class declaringClass = methodInfo.getClassForSure();
+        Member reflectMethod = (Member) HookMain.findMethod(
+                declaringClass, methodInfo.methodName, methodInfo.methodSig);
+        if (reflectMethod == null) {
+            DexLog.e("method not found: name="
+                    + methodInfo.methodName + ", sig=" + methodInfo.methodSig);
+            reflectMethod = hookMethod;
+        }
+        return reflectMethod;
+    }
 }