From 05fead243190f5fc63e56c64e657dc3cdef5a069 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Tue, 7 Jul 2020 07:55:07 +0800
Subject: [PATCH] Skip patching LD_LIBRARY_PATH for Android 7+

---
 .../src/main/java/be/mygod/librootkotlinx/RootServer.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
index e06cbae0..2e5a8919 100644
--- a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
+++ b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
@@ -1,6 +1,7 @@
 package be.mygod.librootkotlinx
 
 import android.content.Context
+import android.os.Build
 import android.os.Looper
 import android.os.Parcelable
 import android.os.RemoteException
@@ -158,7 +159,11 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
                 val appProcess = AppProcess.getAppProcess()
                 RootJava.getLaunchString(context.packageCodePath + " exec",   // hack: plugging in exec
                         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)
         }
@@ -402,7 +407,7 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U
 
         private fun rootMain(args: Array<String>) {
             require(args.isNotEmpty())
-            RootJava.restoreOriginalLdLibraryPath()
+            if (Build.VERSION.SDK_INT < 24) RootJava.restoreOriginalLdLibraryPath()
             val mainInitialized = CountDownLatch(1)
             val main = Thread({
                 @Suppress("DEPRECATION")