From 615ad0cc5a4a049c46afa98c19a864534d10358d Mon Sep 17 00:00:00 2001 From: osm0sis Date: Sun, 29 Dec 2019 15:52:58 -0400 Subject: [PATCH] core: remove remaining legacy workarounds/leftovers --- native/jni/core/bootstages.cpp | 9 +-------- native/jni/include/magisk.h | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/native/jni/core/bootstages.cpp b/native/jni/core/bootstages.cpp index 9cc14fd47..6cf6547ae 100644 --- a/native/jni/core/bootstages.cpp +++ b/native/jni/core/bootstages.cpp @@ -341,13 +341,10 @@ static bool magisk_env() { // Remove stuffs rm_rf("/cache/data_adb"); + rm_rf("/data/adb/modules/.core"); unlink("/data/magisk.img"); unlink("/data/magisk_debug.log"); - // Backwards compatibility - symlink("./.magisk", "/sbin/.core"); - symlink("./modules", MAGISKTMP "/img"); - // Directories in tmpfs overlay xmkdir(MIRRDIR, 0); xmkdir(BLOCKDIR, 0); @@ -431,10 +428,6 @@ static void prepare_modules() { rm_rf(MODULEUPGRADE); } bind_mount(MIRRDIR MODULEROOT, MODULEMNT, false); - // Legacy support - xmkdir(LEGACYCORE, 0755); - symlink(SECURE_DIR "/post-fs-data.d", LEGACYCORE "/post-fs-data.d"); - symlink(SECURE_DIR "/service.d", LEGACYCORE "/service.d"); restorecon(); chmod(SECURE_DIR, 0700); diff --git a/native/jni/include/magisk.h b/native/jni/include/magisk.h index a6509ede6..9fd368b17 100644 --- a/native/jni/include/magisk.h +++ b/native/jni/include/magisk.h @@ -19,12 +19,8 @@ #define MODULEUPGRADE SECURE_DIR "/modules_update" #define DATABIN SECURE_DIR "/magisk" #define MAGISKDB SECURE_DIR "/magisk.db" -#define BOOTCOUNT SECURE_DIR "/.boot_count" #define MANAGERAPK DATABIN "/magisk.apk" -// Legacy crap -#define LEGACYCORE MODULEROOT "/.core" - constexpr const char *applet_names[] = { "su", "resetprop", "magiskhide", nullptr }; // Multi-call entrypoints