MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support changing su requester package name

Browse Source
This commit is contained in:
topjohnwu 2017-10-28 16:20:31 +08:00
parent 2bc30e5c22
commit fe1439fbac
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.py
View File

@ -89,16 +89,6 @@ def build_apk(args):
os.chdir('java') os.chdir('java')
# Build unhide app and place in assets
proc = subprocess.run('{} unhide:assembleRelease'.format(os.path.join('.', 'gradlew')), shell=True)
if proc.returncode != 0:
error('Build Magisk Manager failed!')
source = os.path.join('unhide', 'build', 'outputs', 'apk', 'release', 'unhide-release-unsigned.apk')
target = os.path.join('app', 'src', 'main', 'assets', 'unhide.apk')
cp(source, target)
print('')
if args.release: if args.release:
if not os.path.exists(os.path.join('..', 'release_signature.jks')): if not os.path.exists(os.path.join('..', 'release_signature.jks')):
error('Please generate a java keystore and place it in \'release_signature.jks\'') error('Please generate a java keystore and place it in \'release_signature.jks\'')

2
java

@ -1 +1 @@
Subproject commit 13bf1b27b42dd2f5c4d4152a0c76528c798fa589 Subproject commit 4956d826fbdbad35645260aa3edb3b746651cceb

5
jni/daemon/magisk.c
View File

@ -53,6 +53,7 @@ static void usage() {
" --[init service] start init service\n" " --[init service] start init service\n"
" --unlock-blocks set BLKROSET flag to OFF for all block devices\n" " --unlock-blocks set BLKROSET flag to OFF for all block devices\n"
" --restorecon fix selinux context on Magisk files and folders\n" " --restorecon fix selinux context on Magisk files and folders\n"
" --clone-attr SRC DEST clone permission, owner, and selinux context\n"
"\n" "\n"
"Supported init services:\n" "Supported init services:\n"
" daemon post-fs, post-fs-data, service\n" " daemon post-fs, post-fs-data, service\n"
@ -144,6 +145,10 @@ int main(int argc, char *argv[]) {
} else if (strcmp(argv[1], "--restorecon") == 0) { } else if (strcmp(argv[1], "--restorecon") == 0) {
fix_filecon(); fix_filecon();
return 0; return 0;
} else if (strcmp(argv[1], "--clone-attr") == 0) {
if (argc < 4) usage();
clone_attr(argv[2], argv[3]);
return 0;
} else if (strcmp(argv[1], "--daemon") == 0) { } else if (strcmp(argv[1], "--daemon") == 0) {
// Start daemon, this process won't return // Start daemon, this process won't return
start_daemon(); start_daemon();

2
jni/su

@ -1 +1 @@
Subproject commit 6de95e0d9bb6aa3e657a7e1492eed1b632c9f186 Subproject commit 4335c588fec05f0abefbd930ae39ea96e3b7e6fe