mirror of
https://github.com/topjohnwu/Magisk
synced 2025-11-17 13:53:26 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9624e2304 | ||
|
|
9c6e64f47d | ||
|
|
0afa601551 | ||
|
|
a94fa81195 |
2
app
2
app
Submodule app updated: c840a30c30...3f38579529
1
build.py
1
build.py
@@ -120,6 +120,7 @@ def build_binary(args):
|
|||||||
def build_apk(args):
|
def build_apk(args):
|
||||||
header('* Building Magisk Manager')
|
header('* Building Magisk Manager')
|
||||||
|
|
||||||
|
mkdir(os.path.join('app', 'src', 'main', 'assets'))
|
||||||
for script in ['magisk_uninstaller.sh', 'util_functions.sh']:
|
for script in ['magisk_uninstaller.sh', 'util_functions.sh']:
|
||||||
source = os.path.join('scripts', script)
|
source = os.path.join('scripts', script)
|
||||||
target = os.path.join('app', 'src', 'main', 'assets', script)
|
target = os.path.join('app', 'src', 'main', 'assets', script)
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -8,13 +8,15 @@
|
|||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "magisk.h"
|
#include "magisk.h"
|
||||||
|
|
||||||
|
char socket_name[] = SOCKET_NAME;
|
||||||
|
|
||||||
/* Setup the address and return socket fd */
|
/* Setup the address and return socket fd */
|
||||||
int setup_socket(struct sockaddr_un *sun) {
|
int setup_socket(struct sockaddr_un *sun) {
|
||||||
int fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
int fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
||||||
memset(sun, 0, sizeof(*sun));
|
memset(sun, 0, sizeof(*sun));
|
||||||
sun->sun_family = AF_LOCAL;
|
sun->sun_family = AF_LOCAL;
|
||||||
sun->sun_path[0] = '\0';
|
sun->sun_path[0] = '\0';
|
||||||
memcpy(sun->sun_path + 1, SOCKET_NAME, sizeof(SOCKET_NAME));
|
memcpy(sun->sun_path + 1, socket_name, sizeof(SOCKET_NAME));
|
||||||
return fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
native/jni/external/busybox
vendored
2
native/jni/external/busybox
vendored
Submodule native/jni/external/busybox updated: 272bfb363b...e1895e6c95
@@ -55,6 +55,7 @@ extern char *argv0; /* For changing process name */
|
|||||||
#define init_applet ((char *[]) { "magiskpolicy", "supolicy", NULL })
|
#define init_applet ((char *[]) { "magiskpolicy", "supolicy", NULL })
|
||||||
|
|
||||||
extern int (*applet_main[]) (int, char *[]), (*init_applet_main[]) (int, char *[]);
|
extern int (*applet_main[]) (int, char *[]), (*init_applet_main[]) (int, char *[]);
|
||||||
|
extern char socket_name[]; /* Workaround compiler bug pre NDK r13 */
|
||||||
|
|
||||||
int create_links(const char *bin, const char *path);
|
int create_links(const char *bin, const char *path);
|
||||||
|
|
||||||
|
|||||||
Submodule native/jni/magiskpolicy updated: 2f4062a923...26dfbb3028
@@ -103,4 +103,4 @@ rm -rf /cache/*magisk* /cache/unblock /data/*magisk* /data/cache/*magisk* /data
|
|||||||
/data/user*/*/magisk.db /data/user*/*/com.topjohnwu.magisk /data/user*/*/.tmp.magisk.config \
|
/data/user*/*/magisk.db /data/user*/*/com.topjohnwu.magisk /data/user*/*/.tmp.magisk.config \
|
||||||
/data/adb/*magisk* 2>/dev/null
|
/data/adb/*magisk* 2>/dev/null
|
||||||
|
|
||||||
$BOOTMODE && reboot
|
$BOOTMODE && /system/bin/reboot
|
||||||
|
|||||||
Reference in New Issue
Block a user