From 2d384685e7ddf1a63348ad405598588597b03f55 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Fri, 5 Jan 2024 14:30:07 +0800 Subject: [PATCH] No hardcode ksu tmp path --- gradle.properties | 24 +----------------------- loader/src/common/daemon.cpp | 1 - loader/src/injector/unmount.cpp | 2 +- module/src/post-fs-data.sh | 2 +- 4 files changed, 3 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2cbd6d1..40149b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,23 +1 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true +android.useAndroidX=false diff --git a/loader/src/common/daemon.cpp b/loader/src/common/daemon.cpp index ba4a100..b8ab7ea 100644 --- a/loader/src/common/daemon.cpp +++ b/loader/src/common/daemon.cpp @@ -8,7 +8,6 @@ namespace zygiskd { static std::string TMP_PATH; - // TODO: use /sbin or /debug_ramdisk directly void Init(const char *path) { TMP_PATH = path; } diff --git a/loader/src/injector/unmount.cpp b/loader/src/injector/unmount.cpp index 5b99fdf..c7791bc 100644 --- a/loader/src/injector/unmount.cpp +++ b/loader/src/injector/unmount.cpp @@ -46,7 +46,7 @@ void revert_unmount_ksu() { && std::find(KSU_PARTITIONS.begin(), KSU_PARTITIONS.end(), info.target) != KSU_PARTITIONS.end()) { targets.emplace_back(info.target); } - // Unmount /debug_ramdisk + // Unmount temp dir if (info.type == "tmpfs" && info.source == KSU_OVERLAY_SOURCE) { targets.emplace_back(info.target); } diff --git a/module/src/post-fs-data.sh b/module/src/post-fs-data.sh index 2709b4b..815744c 100644 --- a/module/src/post-fs-data.sh +++ b/module/src/post-fs-data.sh @@ -29,7 +29,7 @@ create_sys_perm() { if [ "$(which magisk)" ]; then export TMP_PATH="$(magisk --path)/zygisksu" else - export TMP_PATH="/debug_ramdisk/zygisksu" + export TMP_PATH="$(ksud path)/zygisksu" fi create_sys_perm $TMP_PATH