Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
615ad0cc
Commit
615ad0cc
authored
Dec 29, 2019
by
osm0sis
Committed by
John Wu
Jan 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: remove remaining legacy workarounds/leftovers
parent
0b41cd85
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
12 deletions
+1
-12
bootstages.cpp
native/jni/core/bootstages.cpp
+1
-8
magisk.h
native/jni/include/magisk.h
+0
-4
No files found.
native/jni/core/bootstages.cpp
View file @
615ad0cc
...
@@ -341,13 +341,10 @@ static bool magisk_env() {
...
@@ -341,13 +341,10 @@ static bool magisk_env() {
// Remove stuffs
// Remove stuffs
rm_rf
(
"/cache/data_adb"
);
rm_rf
(
"/cache/data_adb"
);
rm_rf
(
"/data/adb/modules/.core"
);
unlink
(
"/data/magisk.img"
);
unlink
(
"/data/magisk.img"
);
unlink
(
"/data/magisk_debug.log"
);
unlink
(
"/data/magisk_debug.log"
);
// Backwards compatibility
symlink
(
"./.magisk"
,
"/sbin/.core"
);
symlink
(
"./modules"
,
MAGISKTMP
"/img"
);
// Directories in tmpfs overlay
// Directories in tmpfs overlay
xmkdir
(
MIRRDIR
,
0
);
xmkdir
(
MIRRDIR
,
0
);
xmkdir
(
BLOCKDIR
,
0
);
xmkdir
(
BLOCKDIR
,
0
);
...
@@ -431,10 +428,6 @@ static void prepare_modules() {
...
@@ -431,10 +428,6 @@ static void prepare_modules() {
rm_rf
(
MODULEUPGRADE
);
rm_rf
(
MODULEUPGRADE
);
}
}
bind_mount
(
MIRRDIR
MODULEROOT
,
MODULEMNT
,
false
);
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
();
restorecon
();
chmod
(
SECURE_DIR
,
0700
);
chmod
(
SECURE_DIR
,
0700
);
...
...
native/jni/include/magisk.h
View file @
615ad0cc
...
@@ -19,12 +19,8 @@
...
@@ -19,12 +19,8 @@
#define MODULEUPGRADE SECURE_DIR "/modules_update"
#define MODULEUPGRADE SECURE_DIR "/modules_update"
#define DATABIN SECURE_DIR "/magisk"
#define DATABIN SECURE_DIR "/magisk"
#define MAGISKDB SECURE_DIR "/magisk.db"
#define MAGISKDB SECURE_DIR "/magisk.db"
#define BOOTCOUNT SECURE_DIR "/.boot_count"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MANAGERAPK DATABIN "/magisk.apk"
// Legacy crap
#define LEGACYCORE MODULEROOT "/.core"
constexpr
const
char
*
applet_names
[]
=
{
"su"
,
"resetprop"
,
"magiskhide"
,
nullptr
};
constexpr
const
char
*
applet_names
[]
=
{
"su"
,
"resetprop"
,
"magiskhide"
,
nullptr
};
// Multi-call entrypoints
// Multi-call entrypoints
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment