From e837bdc8ad40d71e64473a22ed1344ee4ead35e4 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 25 Jun 2018 16:11:31 +0800 Subject: [PATCH] Update BusyBox BusyBox is unable to run properly on non-root applications due to seccomp introduced in Android 8.0. The SDK-21 libc.a has system call wrappers that uses the system calls on the whitelist, so binaries compiled with the updated libc can work properly. --- build.py | 8 ++++---- native/jni/external/busybox | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index db5a9deb1..fcf01472b 100755 --- a/build.py +++ b/build.py @@ -122,10 +122,6 @@ def build_binary(args): old_platform = False flags = base_flags - if 'busybox' in targets: - flags += ' B_BB=1' - old_platform = True - if 'b64xz' in targets: flags += ' B_BXZ=1' old_platform = True @@ -163,6 +159,10 @@ def build_binary(args): flags += ' B_BOOT=1' other = True + if 'busybox' in targets: + flags += ' B_BB=1' + other = True + if other: proc = subprocess.run('{} -C native {} -j{}'.format(ndk_build, flags, cpu_count), shell=True) if proc.returncode != 0: diff --git a/native/jni/external/busybox b/native/jni/external/busybox index e074d81e4..47a1fdda3 160000 --- a/native/jni/external/busybox +++ b/native/jni/external/busybox @@ -1 +1 @@ -Subproject commit e074d81e4698bfff7043431e6e185da5e978a536 +Subproject commit 47a1fdda34cbf51932199586b4ddb3c2d4f76af2