Better Hidden & Module Scope

build.gradle

@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
-
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -24,7 +23,7 @@ allprojects {
         templateLibPath = templateRootPath + "/system/lib/"
         templateLib64Path = templateRootPath + "/system/lib64/"
         templateEtcPath = templateRootPath + "/system/etc/"
-        hiddenApiStubJarFilePath = project(":hiddenapi-stubs").projectDir.absolutePath + "/libs/framework-stub.jar"
+        hiddenApiStubJarFilePath = project(":hiddenapi-stubs").buildDir.absolutePath + "/libs/framework-stub.jar"
     }
     repositories {
         google()

dalvikdx/.gitignore

@@ -1 +1,2 @@
 /build
+dex

dalvikdx/build.gradle

@@ -1,47 +1,33 @@
-import org.gradle.internal.os.OperatingSystem
-apply plugin: 'java-library'
+apply plugin: 'com.android.application'
 
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+repositories {
+    jcenter()
 }
 
-sourceCompatibility = "7"
-targetCompatibility = "7"
-
-task findDx {
-    if (OperatingSystem.current().isWindows()){
-        return true
-    }
-    doLast {
-        new ByteArrayOutputStream().withStream { os ->
-            exec {
-                commandLine "which", "dx"
-                standardOutput os
-            }
-            rootProject.ext.dxPath = os.toString()
-        }
-    }
+android {
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+    ndkVersion androidCompileNdkVersion
 }
 
-task dexInJar(type: Jar) {
-    dependsOn jar
-    dependsOn findDx
-    doFirst {
-        exec {
-            workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows()){
-                executable "dx.bat"
-                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            } else {
-                executable "bash"
-                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
+afterEvaluate {
+    android.applicationVariants.all { variant ->
+        def variantNameCapped = variant.name.capitalize()
+        def variantNameLowered = variant.name.toLowerCase()
+
+        task("copyDex${variantNameCapped}", type: Copy) {
+            dependsOn "assemble${variantNameCapped}"
+            def dexOutPath = "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
+            from (dexOutPath){
+                rename("classes.dex", "eddalvikdx.dex")
             }
+            destinationDir file(templateRootPath + "system/framework/")
+            outputs.upToDateWhen { false }
+        }
+        task("makeJar${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
+            dependsOn "assemble${variantNameCapped}"
+            from "${buildDir}/intermediates/javac/${variantNameLowered}/classes"
+            baseName "dalvikdx"
+            outputs.file(archivePath)
         }
     }
-    from "${jar.destinationDir}/classes.dex"
-    destinationDir jar.destinationDir
-    baseName "eddalvikdx"
-    onlyIf {
-        !jar.state.upToDate || !file(archiveName).exists()
-    }
-}
+}

dalvikdx/src/main/AndroidManifest.xml

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

dexmaker/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+dex

dexmaker/build.gradle

@@ -1,37 +1,39 @@
-import org.gradle.internal.os.OperatingSystem
-apply plugin: 'java'
+apply plugin: 'com.android.application'
 
 description = "A utility for doing compile or runtime code generation targeting Android's Dalvik VM"
 
-targetCompatibility = '1.7'
-sourceCompatibility = '1.7'
-
 repositories {
     jcenter()
 }
 
+android {
+    compileSdkVersion androidCompileSdkVersion.toInteger()
+    ndkVersion androidCompileNdkVersion
+}
+
 dependencies {
-    compileOnly project(':dalvikdx')
+    compileOnly files(project(":dalvikdx").tasks.getByName("makeJarRelease").outputs)
 }
 
-task dexInJar(type: Jar) {
-    dependsOn jar
-    doFirst {
-        exec {
-            workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows()){
-                executable "dx.bat"
-                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
-            } else {
-                executable "bash"
-                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
+afterEvaluate {
+    android.applicationVariants.all { variant ->
+        def variantNameCapped = variant.name.capitalize()
+        def variantNameLowered = variant.name.toLowerCase()
+
+        task("copyDex${variantNameCapped}", type: Copy) {
+            dependsOn "assemble${variantNameCapped}"
+            def dexOutPath = "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
+            from (dexOutPath){
+                rename("classes.dex", "eddexmaker.dex")
             }
+            destinationDir file(templateRootPath + "system/framework/")
+            outputs.upToDateWhen { false }
+        }
+        task("makeJar${variantNameCapped}", type: Jar, dependsOn: "assemble${variantNameCapped}") {
+            dependsOn "assemble${variantNameCapped}"
+            from "${buildDir}/intermediates/javac/${variantNameLowered}/classes"
+            baseName "dexmaker"
+            outputs.file(archivePath)
         }
     }
-    from "${jar.destinationDir}/classes.dex"
-    destinationDir jar.destinationDir
-    baseName "eddexmaker"
-    onlyIf {
-        !jar.state.upToDate || !file(archiveName).exists()
-    }
-}
+}

dexmaker/src/main/AndroidManifest.xml

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

edxp-common/build.gradle

@@ -17,13 +17,14 @@ android {
         }
     }
 
+    ndkVersion androidCompileNdkVersion
 }
 
 dependencies {
     compileOnly project(':hiddenapi-stubs')
     api project(':xposed-bridge')
     compileOnly project(':dexmaker')
-    api "androidx.annotation:annotation:1.1.0-rc01"
+    compileOnly 'com.android.support:support-annotations:28.0.0'
 }
 
 

edxp-common/proguard-rules.pro

@@ -21,6 +21,7 @@
 #-renamesourcefileattribute SourceFile
 
 -dontobfuscate
+-dontoptimize
 -keep class de.robv.android.xposed.** {*;}
 -keep class android.** { *; }
 

edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/BaseEdxpConfig.java

@@ -51,4 +51,7 @@ public boolean isNoModuleLogEnabled() {
     public boolean isBlackWhiteListMode() {
         return ConfigManager.isBlackWhiteListEnabled();
     }
+
+    @Override
+    public String getModulesList() { return ConfigManager.getModulesList(); }
 }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/config/ConfigManager.java

@@ -49,5 +49,5 @@ private static boolean isFileExists(String path) {
 
     public static native String getDataPathPrefix();
 
-    public static native boolean isAppNeedHook(String appDataDir);
+    public static native String getModulesList();
 }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/core/BaseEdxpImpl.java

@@ -1,14 +1,12 @@
 package com.elderdrivers.riru.edxp.core;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 
-import com.elderdrivers.riru.edxp.proxy.BlackWhiteListProxy;
 import com.elderdrivers.riru.edxp.proxy.NormalProxy;
 import com.elderdrivers.riru.edxp.proxy.Router;
 
 public abstract class BaseEdxpImpl implements EdxpImpl {
 
-    protected Proxy mBlackWhiteListProxy;
     protected Proxy mNormalProxy;
     protected Router mRouter;
 
@@ -23,15 +21,6 @@ public boolean isInitialized() {
         return mInitialized;
     }
 
-    @NonNull
-    @Override
-    public Proxy getBlackWhiteListProxy() {
-        if (mBlackWhiteListProxy == null) {
-            mBlackWhiteListProxy = createBlackWhiteListProxy();
-        }
-        return mBlackWhiteListProxy;
-    }
-
     @NonNull
     @Override
     public Proxy getNormalProxy() {
@@ -50,10 +39,6 @@ public Router getRouter() {
         return mRouter;
     }
 
-    protected Proxy createBlackWhiteListProxy() {
-        return new BlackWhiteListProxy(getRouter());
-    }
-
     protected Proxy createNormalProxy() {
         return new NormalProxy(getRouter());
     }

edxp-common/src/main/java/com/elderdrivers/riru/edxp/core/EdxpImpl.java

@@ -1,7 +1,7 @@
 package com.elderdrivers.riru.edxp.core;
 
-import androidx.annotation.IntDef;
-import androidx.annotation.NonNull;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
 
 import com.elderdrivers.riru.common.KeepAll;
 import com.elderdrivers.riru.edxp.proxy.Router;
@@ -20,9 +20,6 @@ public interface EdxpImpl extends KeepAll {
     @NonNull
     Proxy getNormalProxy();
 
-    @NonNull
-    Proxy getBlackWhiteListProxy();
-
     @NonNull
     Router getRouter();