From 08a70f033a29027a01dbe344e607f40d552b9637 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 1 Apr 2019 02:46:09 -0400 Subject: [PATCH] Add entrypoint to build test Just for convenience, nothing special here --- build.py | 9 ++++++--- native/build.gradle | 2 +- native/jni/.gitignore | 1 + native/jni/Android.mk | 13 +++++++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 native/jni/.gitignore diff --git a/build.py b/build.py index 836160aa2..6293496e1 100755 --- a/build.py +++ b/build.py @@ -102,7 +102,7 @@ def zip_with_msg(zip_file, source, target): def collect_binary(): for arch in archs + arch64: 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) target = os.path.join('native', 'out', arch, bin) mv(source, target) @@ -183,14 +183,14 @@ def run_ndk_build(flags): def build_binary(args): - support_targets = {'magisk', 'magiskinit', 'magiskboot', 'busybox'} + support_targets = {'magisk', 'magiskinit', 'magiskboot', 'busybox', 'test'} if args.target: args.target = set(args.target) & support_targets if not args.target: return else: # If nothing specified, build everything - args.target = support_targets + args.target = ['magisk', 'magiskinit', 'magiskboot', 'busybox'] header('* Building binaries: ' + ' '.join(args.target)) @@ -230,6 +230,9 @@ def build_binary(args): if 'magiskboot' in args.target: run_ndk_build('B_BOOT=1') + if 'test' in args.target: + run_ndk_build('B_TEST=1') + def build_apk(args, module): build_type = 'Release' if args.release else 'Debug' diff --git a/native/build.gradle b/native/build.gradle index 776ccec96..0049d48d5 100644 --- a/native/build.gradle +++ b/native/build.gradle @@ -12,7 +12,7 @@ android { externalNativeBuild { ndkBuild { // 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') } } diff --git a/native/jni/.gitignore b/native/jni/.gitignore new file mode 100644 index 000000000..d071f4fe6 --- /dev/null +++ b/native/jni/.gitignore @@ -0,0 +1 @@ +test.cpp diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 42a3c6e72..1e7f43615 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -121,6 +121,19 @@ include $(BUILD_EXECUTABLE) 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 include jni/external/busybox/Android.mk