From 205138f6380bc516bba8473af385b9d734689bec Mon Sep 17 00:00:00 2001
From: Nullptr <noreply@nullptr.icu>
Date: Tue, 30 Aug 2022 19:14:11 +0800
Subject: [PATCH] Fix binary patch (#2096)

---
 dex2oat/src/main/cpp/CMakeLists.txt      | 4 +---
 magisk-loader/build.gradle.kts           | 7 +++----
 magisk-loader/magisk_module/customize.sh | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dex2oat/src/main/cpp/CMakeLists.txt b/dex2oat/src/main/cpp/CMakeLists.txt
index b706f6af..ca3f0c82 100644
--- a/dex2oat/src/main/cpp/CMakeLists.txt
+++ b/dex2oat/src/main/cpp/CMakeLists.txt
@@ -1,9 +1,7 @@
 project(dex2oat)
 cmake_minimum_required(VERSION 3.4.1)
 
-add_library(dex2oat SHARED dex2oat.c)
-
-target_link_options(dex2oat PRIVATE "-fPIE")
+add_executable(dex2oat dex2oat.c)
 
 target_link_libraries(dex2oat log)
 
diff --git a/magisk-loader/build.gradle.kts b/magisk-loader/build.gradle.kts
index d492113f..0f4178fb 100644
--- a/magisk-loader/build.gradle.kts
+++ b/magisk-loader/build.gradle.kts
@@ -144,7 +144,7 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
             "assemble$variantCapped",
             ":app:package$buildTypeCapped",
             ":daemon:package$buildTypeCapped",
-            ":dex2oat:strip${buildTypeCapped}DebugSymbols"
+            ":dex2oat:merge${buildTypeCapped}NativeLibs"
         )
         into(magiskDir)
         from("${rootProject.projectDir}/README.md")
@@ -204,9 +204,8 @@ fun afterEval() = android.applicationVariants.forEach { variant ->
             }
         }
         into("bin") {
-            from("${project(":dex2oat").buildDir}/intermediates/stripped_native_libs/$buildTypeLowered/out/lib") {
-                include("**/libdex2oat.so")
-                rename { n -> n.replace("libdex2oat.so", "dex2oat") }
+            from("${project(":dex2oat").buildDir}/intermediates/cmake/$buildTypeLowered/obj") {
+                include("**/dex2oat")
             }
         }
         val dexOutPath = if (buildTypeLowered == "release")
diff --git a/magisk-loader/magisk_module/customize.sh b/magisk-loader/magisk_module/customize.sh
index 44260cf5..abcb8d7a 100644
--- a/magisk-loader/magisk_module/customize.sh
+++ b/magisk-loader/magisk_module/customize.sh
@@ -176,7 +176,7 @@ if [ "$API" -ge 29 ]; then
   while [ -d "/dev/$DEV_PATH" ]; do
     DEV_PATH=$(tr -dc 'a-f0-9' < /dev/urandom | head -c 16)
   done
-  sed -i "s/placeholder_\/dev\/................/placeholder_\/dev\/$DEV_PATH/" "$MODPATH/libdaemon.so"
+  sed -i "s/placeholder_\/dev\/................/placeholder_\/dev\/$DEV_PATH/g" "$MODPATH/daemon.apk"
   sed -i "s/placeholder_\/dev\/................/placeholder_\/dev\/$DEV_PATH/" "$MODPATH/bin/dex2oat32"
   sed -i "s/placeholder_\/dev\/................/placeholder_\/dev\/$DEV_PATH/" "$MODPATH/bin/dex2oat64"
 else