From 775d095b3cc2bd20514dca3ab5c57c6e89085c59 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sat, 8 May 2021 16:45:24 -0700 Subject: [PATCH] Update busybox Fix #4225 --- native/jni/Application.mk | 7 ++----- native/jni/external/busybox | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/native/jni/Application.mk b/native/jni/Application.mk index b75a00efd..e1d65f416 100644 --- a/native/jni/Application.mk +++ b/native/jni/Application.mk @@ -15,10 +15,7 @@ ifdef B_64BIT APP_ABI += arm64-v8a x86_64 endif -# Busybox require some additional settings +# Busybox should use stock libc.a ifdef B_BB -ifeq ($(OS),Windows_NT) -APP_SHORT_COMMANDS := true -endif -APP_PLATFORM := android-21 +APP_PLATFORM := android-22 endif diff --git a/native/jni/external/busybox b/native/jni/external/busybox index 76822933a..84ce191c8 160000 --- a/native/jni/external/busybox +++ b/native/jni/external/busybox @@ -1 +1 @@ -Subproject commit 76822933adc85c853daa6743d93433461f620849 +Subproject commit 84ce191c8e3e69869617991c275f1b724422c604