From ff2658f2de3d1a9348b94fe1f9cd2a9a55c77c16 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Tue, 28 Feb 2023 20:33:42 +0800 Subject: [PATCH] Rename libs --- loader/src/Android.mk | 4 ++-- loader/src/injector/unmount.cpp | 2 +- loader/src/loader/loader.cpp | 2 +- module/src/customize.sh | 24 ++++++++++++------------ module/src/post-fs-data.sh | 2 +- zygiskd/src/constants.rs | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/loader/src/Android.mk b/loader/src/Android.mk index 74441a6..2d650e5 100644 --- a/loader/src/Android.mk +++ b/loader/src/Android.mk @@ -13,7 +13,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := zygiskloader +LOCAL_MODULE := zygisk_loader LOCAL_C_INCLUDES := $(LOCAL_PATH)/include FILE_LIST := $(filter %.cpp, $(call walk, $(LOCAL_PATH)/loader)) LOCAL_SRC_FILES := $(FILE_LIST:COMMON_FILE_LIST:$(LOCAL_PATH)/%=%) @@ -22,7 +22,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := injector +LOCAL_MODULE := zygisk_injector LOCAL_C_INCLUDES := $(LOCAL_PATH)/include FILE_LIST := $(filter %.cpp, $(call walk, $(LOCAL_PATH)/injector)) LOCAL_SRC_FILES := $(FILE_LIST:COMMON_FILE_LIST:$(LOCAL_PATH)/%=%) diff --git a/loader/src/injector/unmount.cpp b/loader/src/injector/unmount.cpp index 7b893a2..201a573 100644 --- a/loader/src/injector/unmount.cpp +++ b/loader/src/injector/unmount.cpp @@ -117,7 +117,7 @@ void revert_unmount_magisk() { } } - for (auto& s: targets) { + for (auto& s: reversed(targets)) { lazy_unmount(s.data()); } } diff --git a/loader/src/loader/loader.cpp b/loader/src/loader/loader.cpp index 21ad1f3..e85bbda 100644 --- a/loader/src/loader/loader.cpp +++ b/loader/src/loader/loader.cpp @@ -13,7 +13,7 @@ uint8_t NativeBridgeItf[sizeof(NativeBridgeCallbacks<__ANDROID_API_R__>) * 2]{0} namespace { constexpr auto kZygoteProcesses = {"zygote", "zygote32", "zygote64", "usap32", "usap64"}; - constexpr auto kInjector = "/system/" LP_SELECT("lib", "lib64") "/libinjector.so"; + constexpr auto kInjector = "/system/" LP_SELECT("lib", "lib64") "/libzygisk_injector.so"; void* sOriginalBridge = nullptr; } diff --git a/module/src/customize.sh b/module/src/customize.sh index eb885c1..119fbb1 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -109,8 +109,8 @@ if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then ui_print "- Extracting x86 libraries" extract "$ZIPFILE" 'bin/x86/zygiskd' "$MODPATH/bin" true mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32" - extract "$ZIPFILE" 'lib/x86/libinjector.so' "$MODPATH/system/lib" true - extract "$ZIPFILE" 'lib/x86/libzygiskloader.so' "$MODPATH/system/lib" true + extract "$ZIPFILE" 'lib/x86/libzygisk_injector.so' "$MODPATH/system/lib" true + extract "$ZIPFILE" 'lib/x86/libzygisk_loader.so' "$MODPATH/system/lib" true ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd" fi @@ -118,8 +118,8 @@ if [ "$ARCH" = "x86" ] || [ "$ARCH" = "x64" ]; then ui_print "- Extracting x64 libraries" extract "$ZIPFILE" 'bin/x86_64/zygiskd' "$MODPATH/bin" true mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64" - extract "$ZIPFILE" 'lib/x86_64/libinjector.so' "$MODPATH/system/lib64" true - extract "$ZIPFILE" 'lib/x86_64/libzygiskloader.so' "$MODPATH/system/lib64" true + extract "$ZIPFILE" 'lib/x86_64/libzygisk_injector.so' "$MODPATH/system/lib64" true + extract "$ZIPFILE" 'lib/x86_64/libzygisk_loader.so' "$MODPATH/system/lib64" true ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd" fi else @@ -127,8 +127,8 @@ else ui_print "- Extracting arm libraries" extract "$ZIPFILE" 'bin/armeabi-v7a/zygiskd' "$MODPATH/bin" true mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd32" - extract "$ZIPFILE" 'lib/armeabi-v7a/libinjector.so' "$MODPATH/system/lib" true - extract "$ZIPFILE" 'lib/armeabi-v7a/libzygiskloader.so' "$MODPATH/system/lib" true + extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_injector.so' "$MODPATH/system/lib" true + extract "$ZIPFILE" 'lib/armeabi-v7a/libzygisk_loader.so' "$MODPATH/system/lib" true ln -sf "zygiskd32" "$MODPATH/bin/zygiskwd" fi @@ -136,8 +136,8 @@ else ui_print "- Extracting arm64 libraries" extract "$ZIPFILE" 'bin/arm64-v8a/zygiskd' "$MODPATH/bin" true mv "$MODPATH/bin/zygiskd" "$MODPATH/bin/zygiskd64" - extract "$ZIPFILE" 'lib/arm64-v8a/libinjector.so' "$MODPATH/system/lib64" true - extract "$ZIPFILE" 'lib/arm64-v8a/libzygiskloader.so' "$MODPATH/system/lib64" true + extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_injector.so' "$MODPATH/system/lib64" true + extract "$ZIPFILE" 'lib/arm64-v8a/libzygisk_loader.so' "$MODPATH/system/lib64" true ln -sf "zygiskd64" "$MODPATH/bin/zygiskwd" fi fi @@ -147,13 +147,13 @@ if [ $DEBUG = false ]; then SOCKET_PATCH=$(tr -dc 'a-f0-9' /dev/.native_bridge -resetprop ro.dalvik.vm.native.bridge libzygiskloader.so +resetprop ro.dalvik.vm.native.bridge libzygisk_loader.so if [ "$(which magisk)" ] && [ ".." -ef "/data/adb/modules" ]; then for file in ../*; do diff --git a/zygiskd/src/constants.rs b/zygiskd/src/constants.rs index f32e68a..a3f50ee 100644 --- a/zygiskd/src/constants.rs +++ b/zygiskd/src/constants.rs @@ -18,7 +18,7 @@ pub const MAX_LOG_LEVEL: LevelFilter = LevelFilter::Info; pub const PROP_NATIVE_BRIDGE: &str = "ro.dalvik.vm.native.bridge"; pub const PROP_CTL_RESTART: &str = "ctl.restart"; -pub const ZYGISK_LOADER: &str = "libzygiskloader.so"; +pub const ZYGISK_LOADER: &str = "libzygisk_loader.so"; pub const SOCKET_PLACEHOLDER: &str = "socket_placeholder";