Use striped so for debug build

LSPosed · Sep 3, 2022 · 35a8dd4 · 35a8dd4
1 parent 95f0066
commit 35a8dd4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -84,7 +84,6 @@ dependencies {
     val composeDestinationsVersion = "1.7.17-beta"
     annotationProcessor("androidx.room:room-compiler:$roomVersion")
     compileOnly("dev.rikka.hidden:stub:2.3.1")
-    implementation("dev.rikka.hidden:compat:2.3.1")
     implementation("androidx.core:core-ktx:1.8.0")
     implementation("androidx.activity:activity-compose:1.6.0-rc01")
     implementation("androidx.compose.material:material-icons-extended:1.3.0-beta01")

diff --git a/manager/proguard-rules-debug.pro b/manager/proguard-rules-debug.pro
@@ -1,6 +1,7 @@
 -dontobfuscate
 -keep class com.beust.jcommander.** { *; }
 -keep class org.lsposed.lspatch.Patcher$Options { *; }
+-keep class org.lsposed.lspatch.share.LSPConfig { *; }
 -keep class org.lsposed.lspatch.share.PatchConfig { *; }
 -keepclassmembers class org.lsposed.patch.LSPatch {
     private <fields>;

diff --git a/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt b/manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
@@ -26,7 +26,6 @@ import java.io.File
 import java.io.IOException
 import java.text.Collator
 import java.util.*
-import java.util.concurrent.CountDownLatch
 import java.util.zip.ZipFile
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -102,15 +101,12 @@ object LSPPackageManager {
                     }
                     var result: Intent? = null
                     suspendCoroutine { cont ->
-                        val countDownLatch = CountDownLatch(1)
                         val adapter = IntentSenderHelper.IIntentSenderAdaptor { intent ->
                             result = intent
-                            countDownLatch.countDown()
+                            cont.resume(Unit)
                         }
                         val intentSender = IntentSenderHelper.newIntentSender(adapter)
                         session.commit(intentSender)
-                        countDownLatch.await()
-                        cont.resume(Unit)
                     }
                     result?.let {
                         status = it.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)
@@ -132,15 +128,12 @@ object LSPPackageManager {
             runCatching {
                 var result: Intent? = null
                 suspendCoroutine { cont ->
-                    val countDownLatch = CountDownLatch(1)
                     val adapter = IntentSenderHelper.IIntentSenderAdaptor { intent ->
                         result = intent
-                        countDownLatch.countDown()
+                        cont.resume(Unit)
                     }
                     val intentSender = IntentSenderHelper.newIntentSender(adapter)
                     ShizukuApi.uninstallPackage(packageName, intentSender)
-                    countDownLatch.await()
-                    cont.resume(Unit)
                 }
                 result?.let {
                     status = it.getIntExtra(PackageInstaller.EXTRA_STATUS, PackageInstaller.STATUS_FAILURE)

diff --git a/patch-loader/build.gradle.kts b/patch-loader/build.gradle.kts
@@ -35,7 +35,7 @@ androidComponents.onVariants { variant ->
         dependsOn("assemble$variantCapped")
         from(
             fileTree(
-                "dir" to "$buildDir/intermediates/merged_native_libs/${variant.name}/out/lib",
+                "dir" to "$buildDir/intermediates/stripped_native_libs/${variant.name}/out/lib",
                 "include" to listOf("**/liblspatch.so")
             )
         )