brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip patching LD_LIBRARY_PATH for Android 7+

Browse Source
This commit is contained in:
Mygod
2020-07-07 07:55:07 +08:00
parent b7d01333fd
commit 05fead2431
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
View File

@@ -1,6 +1,7 @@
package be.mygod.librootkotlinx package be.mygod.librootkotlinx
import android.content.Context import android.content.Context
import android.os.Build
import android.os.Looper import android.os.Looper
import android.os.Parcelable import android.os.Parcelable
import android.os.RemoteException import android.os.RemoteException
@@ -158,7 +159,11 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
val appProcess = AppProcess.getAppProcess() val appProcess = AppProcess.getAppProcess()
RootJava.getLaunchString(context.packageCodePath + " exec", // hack: plugging in exec RootJava.getLaunchString(context.packageCodePath + " exec", // hack: plugging in exec
RootServer::class.java.name, appProcess, AppProcess.guessIfAppProcessIs64Bits(appProcess), RootServer::class.java.name, appProcess, AppProcess.guessIfAppProcessIs64Bits(appProcess),
arrayOf("$token2\n"), niceName) arrayOf("$token2\n"), niceName).let { result ->
if (Build.VERSION.SDK_INT < 24) result
// undo the patch on newer APIs to let linker do the work
else result.replaceFirst(" LD_LIBRARY_PATH=", " __SUPPRESSED_LD_LIBRARY_PATH=")
}
} }
awaitAll(init, launchString) awaitAll(init, launchString)
} }
@@ -402,7 +407,7 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
private fun rootMain(args: Array<String>) { private fun rootMain(args: Array<String>) {
require(args.isNotEmpty()) require(args.isNotEmpty())
RootJava.restoreOriginalLdLibraryPath() if (Build.VERSION.SDK_INT < 24) RootJava.restoreOriginalLdLibraryPath()
val mainInitialized = CountDownLatch(1) val mainInitialized = CountDownLatch(1)
val main = Thread({ val main = Thread({
@Suppress("DEPRECATION") @Suppress("DEPRECATION")