From 559f2860dd3d4e1dd5f3a4a4cd2258f08cd8a490 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sun, 26 Feb 2023 01:25:25 +0800
Subject: [PATCH] Fix native method registration

---
 .github/workflows/core.yml               |  1 +
 core/src/main/jni/src/jni/dex_parser.cpp |  4 ++--
 daemon/build.gradle.kts                  | 16 +++++-----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
index cbc40877..8f739e73 100644
--- a/.github/workflows/core.yml
+++ b/.github/workflows/core.yml
@@ -16,6 +16,7 @@ jobs:
       CCACHE_NOHASHDIR: "true"
       CCACHE_MAXSIZE: "1G"
       CCACHE_HARDLINK: "true"
+      CCACHE_BASEDIR: "${{ github.workspace }}"
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/core/src/main/jni/src/jni/dex_parser.cpp b/core/src/main/jni/src/jni/dex_parser.cpp
index 676bb21b..6a1bc700 100644
--- a/core/src/main/jni/src/jni/dex_parser.cpp
+++ b/core/src/main/jni/src/jni/dex_parser.cpp
@@ -809,8 +809,8 @@ namespace lspd {
 
     static JNINativeMethod gMethods[] = {
             LSP_NATIVE_METHOD(DexParserBridge, openDex,
-                              "(Ljava/nio/buffer/ByteBuffer;[J)Ljava/lang/Object;"),
-            LSP_NATIVE_METHOD(DexParserBridge, closeDex, "(J)V;"),
+                              "(Ljava/nio/ByteBuffer;[J)Ljava/lang/Object;"),
+            LSP_NATIVE_METHOD(DexParserBridge, closeDex, "(J)V"),
             LSP_NATIVE_METHOD(DexParserBridge, visitClass,
                               "(JLjava/lang/Object;Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;Ljava/lang/reflect/Method;)V"),
     };
diff --git a/daemon/build.gradle.kts b/daemon/build.gradle.kts
index ff42b22c..39cda51f 100644
--- a/daemon/build.gradle.kts
+++ b/daemon/build.gradle.kts
@@ -17,7 +17,6 @@
  * Copyright (C) 2021 LSPosed Contributors
  */
 
-import com.android.build.gradle.BaseExtension
 import com.android.ide.common.signing.KeystoreHelper
 import java.io.PrintStream
 import java.util.*
@@ -84,15 +83,14 @@ android {
     namespace = "org.lsposed.daemon"
 }
 
-fun afterEval() = android.applicationVariants.forEach { variant ->
-    val variantCapped = variant.name.capitalize(Locale.ROOT)
-    val variantLowered = variant.name.toLowerCase(Locale.ROOT)
+android.applicationVariants.all {
+    val variantCapped = name.capitalize(Locale.ROOT)
+    val variantLowered = name.toLowerCase(Locale.ROOT)
 
     val outSrcDir = file("$buildDir/generated/source/signInfo/${variantLowered}")
     val signInfoTask = tasks.register("generate${variantCapped}SignInfo") {
         dependsOn(":app:validateSigning${variantCapped}")
-        val app = rootProject.project(":app").extensions.getByName<BaseExtension>("android")
-        val sign = app.buildTypes.named(variantLowered).get().signingConfig
+        val sign = signingConfig
         val outSrc = file("$outSrcDir/org/lsposed/lspd/util/SignInfo.java")
         outputs.file(outSrc)
         doLast {
@@ -115,11 +113,7 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
             )
         }
     }
-    variant.registerJavaGeneratingTask(signInfoTask, outSrcDir)
-}
-
-afterEvaluate {
-    afterEval()
+    registerJavaGeneratingTask(signInfoTask, outSrcDir)
 }
 
 dependencies {