From e55ecdf67c4debf95f12af8d02ae4f1a2b783ad4 Mon Sep 17 00:00:00 2001 From: JingMatrix Date: Mon, 23 Sep 2024 08:38:19 +0200 Subject: [PATCH] Remove LSPlt submodule Close #43 as completed. --- .gitmodules | 3 --- README.md | 3 +-- core/src/main/jni/CMakeLists.txt | 2 +- core/src/main/jni/include/native_util.h | 1 - external/CMakeLists.txt | 1 - external/lsplt | 1 - 6 files changed, 2 insertions(+), 9 deletions(-) delete mode 160000 external/lsplt diff --git a/.gitmodules b/.gitmodules index 6b59e25a..560dad57 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "external/dobby"] path = external/dobby url = https://github.com/JingMatrix/Dobby.git -[submodule "external/lsplt"] - path = external/lsplt - url = https://github.com/LSPosed/LSPlt.git [submodule "external/fmt"] path = external/fmt url = https://github.com/fmtlib/fmt.git diff --git a/README.md b/README.md index 7230bb0f..dc9df946 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,7 @@ You can contribute translation [here](https://crowdin.com/project/lsposed_jingma - [Magisk](https://github.com/topjohnwu/Magisk/): makes all these possible - [XposedBridge](https://github.com/rovo89/XposedBridge): the OG Xposed framework APIs -- [LSPlt](https://github.com/LSPosed/LSPlt): used for (Android 15) `libart` inline hooking -- [Dobby](https://github.com/JingMatrix/Dobby): used for fallback and `native_api` inline hooking +- [Dobby](https://github.com/JingMatrix/Dobby): fallback of PLT hook and inline hooker for `native_api` implement - [LSPlant](https://github.com/JingMatrix/LSPlant): the core ART hooking framework - [EdXposed](https://github.com/ElderDrivers/EdXposed): fork source - [xz-embedded](https://github.com/tukaani-project/xz-embedded): decompress `.gnu_debugdata` header section of stripped `libart.so` diff --git a/core/src/main/jni/CMakeLists.txt b/core/src/main/jni/CMakeLists.txt index adf494a9..64e8b559 100644 --- a/core/src/main/jni/CMakeLists.txt +++ b/core/src/main/jni/CMakeLists.txt @@ -12,5 +12,5 @@ add_library(${PROJECT_NAME} STATIC ${SRC_LIST}) target_include_directories(${PROJECT_NAME} PUBLIC include) target_include_directories(${PROJECT_NAME} PRIVATE src ${EXTERNAL_ROOT}/xz-embedded/linux/include) -target_link_libraries(${PROJECT_NAME} PUBLIC dobby_static lsplant_static lsplt_static xz_static log fmt-header-only) +target_link_libraries(${PROJECT_NAME} PUBLIC dobby_static lsplant_static xz_static log fmt-header-only) target_link_libraries(${PROJECT_NAME} PRIVATE dex_builder_static) diff --git a/core/src/main/jni/include/native_util.h b/core/src/main/jni/include/native_util.h index 5a879a97..dbd28dca 100644 --- a/core/src/main/jni/include/native_util.h +++ b/core/src/main/jni/include/native_util.h @@ -22,7 +22,6 @@ #include #include "elf_util.h" -#include "lsplt.hpp" #include "symbol_cache.h" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-value" diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 8f0007e3..0fcc7d22 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -118,5 +118,4 @@ OPTION(LSPLT_BUILD_SHARED OFF) add_subdirectory(dobby) add_subdirectory(fmt) add_subdirectory(lsplant/lsplant/src/main/jni) -add_subdirectory(lsplt/lsplt/src/main/jni) target_compile_definitions(fmt-header-only INTERFACE FMT_STATIC_THOUSANDS_SEPARATOR=1 FMT_USE_FLOAT=0 FMT_USE_DOUBLE=0 FMT_USE_LONG_DOUBLE=0 FMT_USE_BITINT=0) diff --git a/external/lsplt b/external/lsplt deleted file mode 160000 index cef80a97..00000000 --- a/external/lsplt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cef80a97a73184b4def9b3e1148884365fc173fd