Merge magiskpolicy, magiskhide, resetprop, magisksu

This commit is contained in:
topjohnwu
2017-04-05 06:08:53 +08:00
parent 82e969627a
commit acfde9458d
14 changed files with 220668 additions and 20 deletions

View File

@@ -4,5 +4,5 @@ include $(CLEAR_VARS)
LOCAL_MODULE := resetprop
LOCAL_SRC_FILES := resetprop.cpp system_properties.cpp libc_logging.cpp
LOCAL_LDLIBS += -latomic
LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch
LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch -DINDEP_BINARY
include $(BUILD_EXECUTABLE)

View File

@@ -3,7 +3,7 @@
* resetprop.cpp
*
* Copyright 2016 nkk71 <nkk71x@gmail.com>
* Copyright 2016 topjohnwu <topjohnwu#gmail.com>
* Copyright 2016 topjohnwu <topjohnwu@gmail.com>
*
*
* This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,15 @@
#include "_system_properties.h"
#include <sys/system_properties.h>
#ifdef INDEP_BINARY
int resetprop_main(int argc, char *argv[]);
int main(int argc, char *argv[]) {
return resetprop_main(argc, argv);
}
#else
#include "magisk.h"
#endif
/* Info:
*
* all changes are in
@@ -205,8 +214,7 @@ int usage(char* name) {
return 1;
}
int main(int argc, char *argv[])
{
int resetprop_main(int argc, char *argv[]) {
int exp_arg = 2, stdout_bak, null;
char *name, *value, *filename;