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

Refactor build flags

Browse Source
This commit is contained in:
topjohnwu 2019-02-12 05:17:02 -05:00
parent b3fd79cbb9
commit ed027ec3ee
12 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@ -191,7 +191,7 @@ def build_binary(args):
os.utime(os.path.join('native', 'jni', 'include', 'flags.h'))
# Basic flags
base_flags = f'MAGISK_VERSION="{config["version"]}" MAGISK_VER_CODE={config["versionCode"]}'
base_flags = f'MAGISK_VERSION={config["version"]} MAGISK_VER_CODE={config["versionCode"]}'
if not args.release:
base_flags += ' MAGISK_DEBUG=1'

3
native/build.gradle
View File

@ -12,7 +12,8 @@ android {
externalNativeBuild {
ndkBuild {
// Pass arguments to ndk-build.
arguments('B_MAGISK=1', 'B_INIT=1', 'B_BOOT=1', 'B_BXZ=1', 'MAGISK_DEBUG=1')
arguments('B_MAGISK=1', 'B_INIT=1', 'B_BOOT=1',
'MAGISK_DEBUG=1', 'MAGISK_VERSION=debug', 'MAGISK_VER_CODE=INT_MAX')
}
}
}

4
native/jni/Application.mk
View File

@ -1,12 +1,12 @@
APP_ABI := armeabi-v7a x86
APP_CFLAGS := -Oz -std=gnu11 \
-DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE}
-D__MVSTR=${MAGISK_VERSION} -D__MCODE=${MAGISK_VER_CODE}
APP_CPPFLAGS := -std=c++17
APP_STL := c++_static
APP_PLATFORM := android-16
ifdef MAGISK_DEBUG
APP_CFLAGS += -DMAGISK_DEBUG
APP_CFLAGS += -D__MDBG
endif
# Busybox require some additional settings

4
native/jni/core/daemon.cpp
View File

@ -70,7 +70,7 @@ static void *request_handler(void *args) {
su_daemon_handler(client, &credential);
break;
case CHECK_VERSION:
write_string(client, xstr(MAGISK_VERSION) ":MAGISK");
write_string(client, MAGISK_VERSION ":MAGISK");
close(client);
break;
case CHECK_VERSION_CODE:
@ -109,7 +109,7 @@ static void main_daemon() {
xdup2(fd, STDIN_FILENO);
close(fd);
LOGI("Magisk v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") daemon started\n");
LOGI(SHOW_VER(Magisk) " daemon started\n");
// Get server stat
stat("/proc/self/exe", &SERVER_STAT);

4
native/jni/core/magisk.cpp
View File

@ -13,7 +13,7 @@
[[noreturn]] static void usage() {
fprintf(stderr,
"Magisk v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu) multi-call binary\n"
FULL_VER(Magisk) " multi-call binary\n"
"\n"
"Usage: magisk [applet [arguments]...]\n"
" or: magisk [options]...\n"
@ -48,7 +48,7 @@ int magisk_main(int argc, char *argv[]) {
if (argc < 2)
usage();
if (strcmp(argv[1], "-c") == 0) {
printf("%s (%d)\n", xstr(MAGISK_VERSION) ":MAGISK", MAGISK_VER_CODE);
printf(MAGISK_VERSION ":MAGISK (" str(MAGISK_VER_CODE) ")\n");
return 0;
} else if (strcmp(argv[1], "-v") == 0) {
int fd = connect_daemon();

19
native/jni/include/flags.h
View File

@ -1,15 +1,20 @@
#pragma once
/* Include this header anywhere you access MAGISK_DEBUG, MAGISK_VERSION, MAGISK_VER_CODE.
/* Include this header anywhere accessing MAGISK_DEBUG, MAGISK_VERSION, MAGISK_VER_CODE.
*
* This file is only for more precise incremental builds. We can make sure code that uses
* This file is for precise incremental builds. We can make sure code that uses
* external flags are re-compiled by updating the timestamp of this file
* */
#ifndef MAGISK_VERSION
#define MAGISK_VERSION 99.99
#endif
#define quote(s) #s
#define str(s) quote(s)
#ifndef MAGISK_VER_CODE
#define MAGISK_VER_CODE 99999
#define MAGISK_VERSION str(__MVSTR)
#define MAGISK_VER_CODE __MCODE
#define SHOW_VER(name) str(name) " v" MAGISK_VERSION "(" str(MAGISK_VER_CODE) ")"
#define FULL_VER(name) SHOW_VER(name) " (by topjohnwu)"
#ifdef __MDBG
#define MAGISK_DEBUG
#endif

2
native/jni/magiskboot/main.cpp
View File

@ -107,7 +107,7 @@ static void usage(char *arg0) {
int main(int argc, char *argv[]) {
cmdline_logging();
fprintf(stderr, "MagiskBoot v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu) - Boot Image Modification Tool\n");
fprintf(stderr, FULL_VER(MagiskBoot) " - Boot Image Modification Tool\n");
umask(0);
if (argc > 1 && strcmp(argv[1], "--cleanup") == 0) {

2
native/jni/magiskhide/magiskhide.cpp
View File

@ -17,7 +17,7 @@ bool hide_enabled = false;
[[noreturn]] static void usage(char *arg0) {
fprintf(stderr,
"MagiskHide v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu)\n\n"
FULL_VER(MagiskHide) "\n\n"
"Usage: %s [--option [arguments...] ]\n\n"
"Options:\n"
" --status Return the status of MagiskHide\n"

2
native/jni/magiskpolicy/magiskpolicy.cpp
View File

@ -86,7 +86,7 @@ static const char *type_msg_6 =
[[noreturn]] static void usage(char *arg0) {
fprintf(stderr,
"MagiskPolicy v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu)\n\n"
FULL_VER(MagiskPolicy) "\n\n"
"Usage: %s [--options...] [policy statements...]\n"
"\n"
"Options:\n"

2
native/jni/resetprop/resetprop.cpp
View File

@ -55,7 +55,7 @@ illegal:
[[noreturn]] static void usage(char* arg0) {
fprintf(stderr,
"resetprop v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ") (by topjohnwu & nkk71) - System Props Modification Tool\n\n"
FULL_VER(resetprop) " - System Props Modification Tool\n\n"
"Usage: %s [flags] [options...]\n"
"\n"
"Options:\n"

4
native/jni/su/su.cpp
View File

@ -35,7 +35,7 @@ static void usage(int status) {
FILE *stream = (status == EXIT_SUCCESS) ? stdout : stderr;
fprintf(stream,
"MagiskSU v" xstr(MAGISK_VERSION) "(" xstr(MAGISK_VER_CODE) ")\n\n"
FULL_VER(MagiskSU) "\n\n"
"Usage: su [options] [-] [user [argument...]]\n\n"
"Options:\n"
" -c, --command COMMAND pass COMMAND to the invoked shell\n"
@ -151,7 +151,7 @@ int su_client_main(int argc, char *argv[]) {
printf("%d\n", MAGISK_VER_CODE);
exit(EXIT_SUCCESS);
case 'v':
printf("%s\n", xstr(MAGISK_VERSION) ":MAGISKSU (topjohnwu)");
printf("%s\n", MAGISK_VERSION ":MAGISKSU");
exit(EXIT_SUCCESS);
case 'z':
// Do nothing, placed here for legacy support :)

3
native/jni/utils/include/logging.h
View File

@ -11,9 +11,6 @@
extern "C" {
#endif
#define str(a) #a
#define xstr(a) str(a)
typedef enum {
L_DEBUG,
L_INFO,