WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Use striped so for debug build

This commit is contained in:
Nullptr 2022-09-03 10:09:18 +08:00
parent 95f006682c
commit 35a8dd4c6d
No known key found for this signature in database
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manager/build.gradle.kts
View File

@ -84,7 +84,6 @@ dependencies {
val composeDestinationsVersion = "1.7.17-beta" val composeDestinationsVersion = "1.7.17-beta"
annotationProcessor("androidx.room:room-compiler:$roomVersion") annotationProcessor("androidx.room:room-compiler:$roomVersion")
compileOnly("dev.rikka.hidden:stub:2.3.1") 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.core:core-ktx:1.8.0")
implementation("androidx.activity:activity-compose:1.6.0-rc01") implementation("androidx.activity:activity-compose:1.6.0-rc01")
implementation("androidx.compose.material:material-icons-extended:1.3.0-beta01") implementation("androidx.compose.material:material-icons-extended:1.3.0-beta01")

1
manager/proguard-rules-debug.pro
View File

@ -1,6 +1,7 @@
-dontobfuscate -dontobfuscate
-keep class com.beust.jcommander.** { *; } -keep class com.beust.jcommander.** { *; }
-keep class org.lsposed.lspatch.Patcher$Options { *; } -keep class org.lsposed.lspatch.Patcher$Options { *; }
-keep class org.lsposed.lspatch.share.LSPConfig { *; }
-keep class org.lsposed.lspatch.share.PatchConfig { *; } -keep class org.lsposed.lspatch.share.PatchConfig { *; }
-keepclassmembers class org.lsposed.patch.LSPatch { -keepclassmembers class org.lsposed.patch.LSPatch {
private <fields>; private <fields>;

11
manager/src/main/java/org/lsposed/lspatch/util/LSPPackageManager.kt
View File

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

2
patch-loader/build.gradle.kts
View File

@ -35,7 +35,7 @@ androidComponents.onVariants { variant ->
dependsOn("assemble$variantCapped") dependsOn("assemble$variantCapped")
from( from(
fileTree( 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") "include" to listOf("**/liblspatch.so")
) )
) )