Add SandHook-hooklib to source tree

build.gradle

@@ -24,6 +24,7 @@ allprojects {
         templateLib64Path = templateRootPath + "/system/lib64/"
         templateEtcPath = templateRootPath + "/system/etc/"
         hiddenApiStubJarFilePath = project(":hiddenapi-stubs").buildDir.absolutePath + "/libs/framework-stub.jar"
+        zipPathMagiskReleasePath = project(":edxp-core").projectDir.path + "/build/tmp/release/magisk"
     }
     repositories {
         google()
@@ -34,8 +35,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-ext {
-    minSdkVersion = 23
-    targetSdkVersion = 28
-}

edxp-common/build.gradle

@@ -4,8 +4,8 @@ android {
     compileSdkVersion androidCompileSdkVersion.toInteger()
 
     defaultConfig {
-        minSdkVersion 26
-        targetSdkVersion 28
+        minSdkVersion minSdkVersion
+        targetSdkVersion targetSdkVersion
         versionCode 1
         versionName "1.0"
     }

edxp-core/build.gradle

@@ -41,7 +41,6 @@ ext {
     sandhook_authors = "solohsu, MlgmXyysd & ganyao114"
 
     riruModuleId = "edxp"
-    zipPathMagiskRelease = "$buildDir/tmp/release/magisk"
 
     moduleMinRiruApiVersion = 10
     moduleMinRiruVersionName = "v23.0"
@@ -120,13 +119,16 @@ afterEvaluate {
         def variantLowered = variant.name.toLowerCase()
 
         backends.each { backend ->
-
             def backendLowered = backend.toLowerCase()
             def backendCapped = backendLowered.capitalize()
             def authorList = property("${backendLowered}" + "_authors")
             def magiskModuleId = property("${backendLowered}" + "_module_id")
 
+            project.logger.lifecycle("delete file")
+            delete file(zipPathMagiskReleasePath)
+
             def prepareJarsTask = task("prepareJars${backendCapped}${variantCapped}") {
+                project.logger.lifecycle("prepareJarsTask")
                 dependsOn cleanTemplate
                 dependsOn tasks.getByPath(":dexmaker:copyDex${variantCapped}")
                 dependsOn tasks.getByPath(":dalvikdx:copyDex${variantCapped}")
@@ -136,7 +138,6 @@ afterEvaluate {
 
             def prepareMagiskFilesTask = task("prepareMagiskFiles${backendCapped}${variantCapped}", type: Delete) {
                 dependsOn prepareJarsTask, "assemble${variantCapped}"
-                delete file(zipPathMagiskRelease)
                 doFirst {
                     copy {
                         from "${projectDir}/tpl/edconfig.tpl"
@@ -169,12 +170,12 @@ afterEvaluate {
                 doLast {
                     copy {
                         from "${projectDir}/template_override"
-                        into zipPathMagiskRelease
+                        into zipPathMagiskReleasePath
                         exclude exclude_list
                     }
                     copy {
                         from "${projectDir}/template_override"
-                        into zipPathMagiskRelease
+                        into zipPathMagiskReleasePath
                         include 'riru.sh'
                         filter { line ->
                             line.replaceAll('%%%RIRU_MODULE_ID%%%', riruModuleId)
@@ -185,23 +186,27 @@ afterEvaluate {
                                 eol: FixCrLfFilter.CrLf.newInstance("lf"))
                     }
                     copy {
+                        include "libriru_edxp.so"
                         from "$libPathRelease/armeabi-v7a"
-                        into "$zipPathMagiskRelease/system/lib"
+                        into "$zipPathMagiskReleasePath/system/lib"
                     }
                     copy {
+                        include "libriru_edxp.so"
                         from "$libPathRelease/arm64-v8a"
-                        into "$zipPathMagiskRelease/system/lib64"
+                        into "$zipPathMagiskReleasePath/system/lib64"
                     }
                     copy {
+                        include "libriru_edxp.so"
                         from "$libPathRelease/x86"
-                        into "$zipPathMagiskRelease/system_x86/lib"
+                        into "$zipPathMagiskReleasePath/system_x86/lib"
                     }
                     copy {
+                        include "libriru_edxp.so"
                         from "$libPathRelease/x86_64"
-                        into "$zipPathMagiskRelease/system_x86/lib64"
+                        into "$zipPathMagiskReleasePath/system_x86/lib64"
                     }
                     // generate sha1sum
-                    fileTree(zipPathMagiskRelease).matching {
+                    fileTree(zipPathMagiskReleasePath).matching {
                         exclude "README.md", "META-INF"
                     }.visit { f ->
                         if (f.directory) return
@@ -214,7 +219,7 @@ afterEvaluate {
                 dependsOn prepareMagiskFilesTask
                 archiveName "${module_name}-${backend}-${project.version}-${variantLowered}.zip"
                 destinationDir file("$projectDir/release")
-                from "$zipPathMagiskRelease"
+                from "$zipPathMagiskReleasePath"
             }
 
             task("push${backendCapped}${variantCapped}", type: Exec) {

edxp-sandhook/build.gradle

@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.sandhook"
-        minSdkVersion 26
-        targetSdkVersion 28
+        minSdkVersion minSdkVersion
+        targetSdkVersion targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled false
@@ -28,7 +28,7 @@ android {
 dependencies {
     compileOnly project(':hiddenapi-stubs')
     implementation project(':edxp-common')
-    implementation 'com.swift.sandhook:hooklib:4.2.1'
+    implementation project(':sandhook-hooklib')
     compileOnly files(project(":dexmaker").tasks.getByName("makeJarRelease").outputs)
 }
 
@@ -62,21 +62,21 @@ afterEvaluate {
         task("copyDex${variantNameCapped}", type: Copy) {
             dependsOn "assemble${variantNameCapped}"
             dependsOn tasks.getByPath(":edxp-common:copyCommonProperties")
+            dependsOn tasks.getByPath(":sandhook-hooklib:copySandHook${variantNameCapped}LibraryToMagiskTemplate")
             def dexOutPath = variant.name.contains("release") ?
                     "${buildDir}/intermediates/dex/${variantNameLowered}/minify${variantNameCapped}WithR8" :
                     "${buildDir}/intermediates/dex/${variantNameLowered}/mergeDex${variantNameCapped}"
             from (dexOutPath){
                 rename("classes.dex", "edxp.dex")
             }
-            destinationDir file(templateRootPath + "system/framework/")
+            destinationDir file(zipPathMagiskReleasePath + "/system/framework/")
             outputs.upToDateWhen { false }
             doLast {
                 copy {
                     from file(myTemplatePath)
-                    into file(templateRootPath)
+                    into file(zipPathMagiskReleasePath)
                 }
             }
         }
-
     }
 }

edxp-service/build.gradle

@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.yahfa"
-        minSdkVersion 26
-        targetSdkVersion 28
+        minSdkVersion minSdkVersion
+        targetSdkVersion targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled false

edxp-yahfa/build.gradle

@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         applicationId "com.elderdrivers.riru.edxp.yahfa"
-        minSdkVersion 26
-        targetSdkVersion 28
+        minSdkVersion minSdkVersion
+        targetSdkVersion targetSdkVersion
         versionCode 1
         versionName "1.0"
         multiDexEnabled false

gradle.properties

@@ -1,4 +1,6 @@
 androidCompileSdkVersion=30
 androidCompileNdkVersion=22.0.6917172
 android.prefabVersion=1.1.2
-apiCode=93
+apiCode=93
+minSdkVersion=26
+targetSdkVersion=30

sandhook-annotation/.gitignore

@@ -0,0 +1 @@
+/build

sandhook-annotation/build.gradle

@@ -0,0 +1,8 @@
+apply plugin: 'java-library'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/HookClass.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HookClass {
+    Class<?> value();
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/HookMethod.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HookMethod {
+    String value() default "<init>";
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/HookMethodBackup.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HookMethodBackup {
+    String value() default "<init>";
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/HookMode.java

@@ -0,0 +1,17 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HookMode {
+
+    int AUTO = 0;
+    int INLINE = 1;
+    int REPLACE = 2;
+
+    int value() default AUTO;
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/HookReflectClass.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HookReflectClass {
+    String value();
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/MethodParams.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MethodParams {
+    Class<?>[] value();
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/MethodReflectParams.java

@@ -0,0 +1,22 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD,ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MethodReflectParams {
+
+    String BOOLEAN = "boolean";
+    String BYTE = "byte";
+    String CHAR = "char";
+    String DOUBLE = "double";
+    String FLOAT = "float";
+    String INT = "int";
+    String LONG = "long";
+    String SHORT = "short";
+
+    String[] value();
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/Param.java

@@ -0,0 +1,12 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Param {
+    String value() default "";
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/SkipParamCheck.java

@@ -0,0 +1,11 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SkipParamCheck {
+}

sandhook-annotation/src/main/java/com/swift/sandhook/annotation/ThisObject.java

@@ -0,0 +1,11 @@
+package com.swift.sandhook.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ThisObject {
+}

sandhook-hooklib/.gitignore

@@ -0,0 +1,2 @@
+/build
+/.cxx