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

Add entrypoint to build test

Browse Source 
Just for convenience, nothing special here
This commit is contained in:
topjohnwu 2019-04-01 02:46:09 -04:00
parent 1b0c36dbd5
commit 08a70f033a
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.py
View File

@ -102,7 +102,7 @@ def zip_with_msg(zip_file, source, target):
def collect_binary(): def collect_binary():
for arch in archs + arch64: for arch in archs + arch64:
mkdir_p(os.path.join('native', 'out', arch)) mkdir_p(os.path.join('native', 'out', arch))
for bin in ['magisk', 'magiskinit', 'magiskinit64', 'magiskboot', 'busybox']: for bin in ['magisk', 'magiskinit', 'magiskinit64', 'magiskboot', 'busybox', 'test']:
source = os.path.join('native', 'libs', arch, bin) source = os.path.join('native', 'libs', arch, bin)
target = os.path.join('native', 'out', arch, bin) target = os.path.join('native', 'out', arch, bin)
mv(source, target) mv(source, target)
@ -183,14 +183,14 @@ def run_ndk_build(flags):
def build_binary(args): def build_binary(args):
support_targets = {'magisk', 'magiskinit', 'magiskboot', 'busybox'} support_targets = {'magisk', 'magiskinit', 'magiskboot', 'busybox', 'test'}
if args.target: if args.target:
args.target = set(args.target) & support_targets args.target = set(args.target) & support_targets
if not args.target: if not args.target:
return return
else: else:
# If nothing specified, build everything # If nothing specified, build everything
args.target = support_targets args.target = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
header('* Building binaries: ' + ' '.join(args.target)) header('* Building binaries: ' + ' '.join(args.target))
@ -230,6 +230,9 @@ def build_binary(args):
if 'magiskboot' in args.target: if 'magiskboot' in args.target:
run_ndk_build('B_BOOT=1') run_ndk_build('B_BOOT=1')
if 'test' in args.target:
run_ndk_build('B_TEST=1')
def build_apk(args, module): def build_apk(args, module):
build_type = 'Release' if args.release else 'Debug' build_type = 'Release' if args.release else 'Debug'

2
native/build.gradle
View File

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

1
native/jni/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
test.cpp

13
native/jni/Android.mk
View File

@ -121,6 +121,19 @@ include $(BUILD_EXECUTABLE)
endif endif
ifdef B_TEST
include $(CLEAR_VARS)
LOCAL_MODULE := test
LOCAL_STATIC_LIBRARIES := libutils
LOCAL_C_INCLUDES := \
jni/include \
$(LIBUTILS)
LOCAL_SRC_FILES := test.cpp
include $(BUILD_EXECUTABLE)
endif
ifdef B_BB ifdef B_BB
include jni/external/busybox/Android.mk include jni/external/busybox/Android.mk