TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 10:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wrapper script on system with APEX

Browse Source 
Thanks to moving libandroidicu.so to APEX runtime linker namespace,
we need a wrapper to link against libsqlite.so on Q
This commit is contained in:
topjohnwu
2019-04-03 17:25:47 -04:00
parent 0c7a95bdf6
commit a385e5cd92
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
native/jni/core/applets.cpp
View File

@@ -8,17 +8,19 @@
#include <selinux.h>
#include <utils.h>
static int (*applet_main[]) (int, char *[]) =
{ magisk_main, su_client_main, resetprop_main, magiskhide_main, nullptr };
using namespace std::literals;
[[noreturn]] static void call_applets(int argc, char *argv[]) {
static int (*applet_main[]) (int, char *[]) =
{ su_client_main, resetprop_main, magiskhide_main, nullptr };
[[noreturn]] static void call_applet(int argc, char **argv) {
// Applets
for (int i = 0; applet_names[i]; ++i) {
if (strcmp(basename(argv[0]), applet_names[i]) == 0) {
exit((*applet_main[i])(argc, argv));
}
}
fprintf(stderr, "%s: applet not found\n", argv[0]);
fprintf(stderr, "%s: applet not found\n", basename(argv[0]));
exit(1);
}
@@ -28,11 +30,24 @@ int main(int argc, char *argv[]) {
cmdline_logging();
init_argv0(argc, argv);
if ((strcmp(basename(argv[0]), "magisk") == 0 && argc > 1 && argv[1][0] != '-')) {
if (basename(argv[0]) == "magisk.bin"sv) {
if (argc == 1)
return 1;
// Running through wrapper
--argc;
++argv;
}
call_applets(argc, argv);
if (basename(argv[0]) == "magisk"sv) {
if (argc > 1 && argv[1][0] != '-') {
// Calling applet via magisk [applet] args
--argc;
++argv;
} else {
return magisk_main(argc, argv);
}
}
call_applet(argc, argv);
}