From 72ca4a62dba728c3623c3f64bff3f817d13d5971 Mon Sep 17 00:00:00 2001
From: kotori <admin@0x.mk>
Date: Fri, 10 Nov 2023 22:53:24 -0500
Subject: [PATCH] use libcxx prefab

---
 app/build.gradle.kts            |  7 +++++++
 app/src/main/cpp/CMakeLists.txt | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 018f753..75a6382 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,6 +11,9 @@ android {
             excludes += "**/libdobby.so"
         }
     }
+    buildFeatures {
+        prefab = true
+    }
 
     defaultConfig {
         applicationId = "es.chiteroman.playintegrityfix"
@@ -61,4 +64,8 @@ android {
 
     ndkVersion = "26.1.10909125"
     buildToolsVersion = "34.0.0"
+}
+
+dependencies {
+    implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
 }
\ No newline at end of file
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 7f39c56..bc1e9ae 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -1,29 +1,29 @@
 cmake_minimum_required(VERSION 3.22.1)
 project(zygisk)
 
-include_directories(D:/libcxx_build/jni/libcxx/include)
-
-link_libraries(D:/libcxx_build/obj/local/${CMAKE_ANDROID_ARCH_ABI}/libcxx.a)
+find_package(cxx REQUIRED CONFIG)
 
 if ((${CMAKE_ANDROID_ARCH_ABI} STREQUAL "arm64-v8a"))
 
     file(GLOB shadowhook_src shadowhook/*.c shadowhook/arch/arm64/*.c shadowhook/common/*.c shadowhook/third_party/*/*.c)
     add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp ${shadowhook_src})
     target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE shadowhook shadowhook/arch/arm64 shadowhook/common shadowhook/include shadowhook/third_party/bsd shadowhook/third_party/lss shadowhook/third_party/xdl)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log cxx::cxx)
 
 elseif (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "armeabi-v7a")
 
     file(GLOB shadowhook_src shadowhook/*.c shadowhook/arch/arm/*.c shadowhook/common/*.c shadowhook/third_party/*/*.c)
     add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp ${shadowhook_src})
     target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE shadowhook shadowhook/arch/arm shadowhook/common shadowhook/include shadowhook/third_party/bsd shadowhook/third_party/lss shadowhook/third_party/xdl)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log cxx::cxx)
 
 else ()
 
     add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp)
     add_subdirectory(Dobby)
     SET_OPTION(Plugin.Android.BionicLinkerUtil ON)
-    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log dobby_static)
+    target_link_libraries(dobby cxx::cxx)
+    target_link_libraries(dobby_static cxx::cxx)
+    target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log dobby_static cxx::cxx)
 
 endif ()
\ No newline at end of file