Better Hidden

Author: yujincheng08

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

dalvikdx/.gitignore

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

dalvikdx/build.gradle

@@ -23,21 +23,31 @@ task findDx {
     }
 }
 
-task dexInJar(type: Jar) {
+task makeDex(type: Exec) {
     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}"
-            }
-        }
+    def dexName = "classes.dex"
+    workingDir jar.destinationDir
+    if (OperatingSystem.current().isWindows()) {
+        executable "dx.bat"
+        args "--dex", "--output", dexName, "${jar.archiveName}"
+    } else {
+        executable "bash"
+        args rootProject.ext.dxPath.trim(), "--dex", "--output", dexName, "${jar.archiveName}"
     }
+}
+
+task dex(type: Copy) {
+    dependsOn makeDex
+    from (jar.destinationDir) {
+        include "classes.dex"
+        rename "classes.dex", "eddalvikdx.dex"
+    }
+    destinationDir new File(projectDir, "dex")
+}
+
+task dexInJar(type: Jar) {
+    dependsOn makeDex
     from "${jar.destinationDir}/classes.dex"
     destinationDir jar.destinationDir
     baseName "eddalvikdx"

dexmaker/.gitignore

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

dexmaker/build.gradle

@@ -14,20 +14,30 @@ dependencies {
     compileOnly project(':dalvikdx')
 }
 
-task dexInJar(type: Jar) {
+task makeDex(type: Exec) {
     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}"
-            }
-        }
+    def dexName = "classes.dex"
+    workingDir jar.destinationDir
+    if (OperatingSystem.current().isWindows()) {
+        executable "dx.bat"
+        args "--dex", "--output", dexName, "${jar.archiveName}"
+    } else {
+        executable "bash"
+        args rootProject.ext.dxPath.trim(), "--dex", "--output", dexName, "${jar.archiveName}"
+    }
+}
+
+task dex(type: Copy) {
+    dependsOn makeDex
+    from (jar.destinationDir) {
+        include "classes.dex"
+        rename "classes.dex", "eddexmaker.dex"
     }
+    destinationDir new File(projectDir, "dex")
+}
+
+task dexInJar(type: Jar) {
+    dependsOn makeDex
     from "${jar.destinationDir}/classes.dex"
     destinationDir jar.destinationDir
     baseName "eddexmaker"

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/libs/framework-stub.jar

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