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

Simplify debug flag propagation

Browse Source
This commit is contained in:
topjohnwu 2018-09-28 02:05:55 -04:00
parent 2118beeb23
commit b127e01845
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@ -173,8 +173,9 @@ def build_binary(args):
os.utime(os.path.join('native', 'jni', 'include', 'flags.h')) os.utime(os.path.join('native', 'jni', 'include', 'flags.h'))
# Basic flags # Basic flags
base_flags = 'MAGISK_VERSION=\"{}\" MAGISK_VER_CODE={} MAGISK_DEBUG={}'.format(config['version'], config['versionCode'], base_flags = 'MAGISK_VERSION=\"{}\" MAGISK_VER_CODE={}'.format(config['version'], config['versionCode'])
'' if args.release else '-DMAGISK_DEBUG') if not args.release:
base_flags += ' MAGISK_DEBUG=1'
if 'magisk' in args.target: if 'magisk' in args.target:
# Magisk is special case as it is a dependency of magiskinit # Magisk is special case as it is a dependency of magiskinit

3
native/build.gradle
View File

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

7
native/jni/Application.mk
View File

@ -1,10 +1,13 @@
APP_ABI := armeabi-v7a x86 APP_ABI := armeabi-v7a x86
APP_CFLAGS := -std=gnu11 ${MAGISK_DEBUG} \ APP_CFLAGS := -std=gnu11 -DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE}
-DMAGISK_VERSION="${MAGISK_VERSION}" -DMAGISK_VER_CODE=${MAGISK_VER_CODE}
APP_CPPFLAGS := -std=c++14 APP_CPPFLAGS := -std=c++14
APP_STL := system APP_STL := system
APP_PLATFORM := android-16 APP_PLATFORM := android-16
ifdef MAGISK_DEBUG
APP_CFLAGS += -DMAGISK_DEBUG
endif
# Busybox require some additional settings # Busybox require some additional settings
ifdef B_BB ifdef B_BB
APP_SHORT_COMMANDS := true APP_SHORT_COMMANDS := true