diff options
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | gui/Android.mk | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index 1a4b9c0c6..8189ffae3 100644 --- a/Android.mk +++ b/Android.mk @@ -380,6 +380,11 @@ else endif ifneq ($(TW_USE_TOOLBOX), true) LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks + ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) + LOCAL_POST_INSTALL_CMD := \ + $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin && \ + ln -sf /sbin/busybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh + endif else ifneq ($(wildcard external/toybox/Android.mk),) LOCAL_ADDITIONAL_DEPENDENCIES += toybox_symlinks @@ -391,6 +396,7 @@ else LOCAL_ADDITIONAL_DEPENDENCIES += unzip endif endif + ifneq ($(TW_NO_EXFAT), true) LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs fsckexfat ifneq ($(TW_NO_EXFAT_FUSE), true) diff --git a/gui/Android.mk b/gui/Android.mk index b21c9f424..8361bcbb4 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -141,22 +141,11 @@ endif TWRP_RES += $(TW_ADDITIONAL_RES) TWRP_RES_GEN := $(intermediates)/twrp -ifneq ($(TW_USE_TOOLBOX), true) - TWRP_SH_TARGET := /sbin/busybox -else - TWRP_SH_TARGET := /sbin/mksh -endif - $(TWRP_RES_GEN): mkdir -p $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) cp -fr $(TWRP_RES) $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) cp -fr $(TWRP_THEME_LOC)/* $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/ -ifneq ($(TW_USE_TOOLBOX), true) -ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 24; echo $$?),0) - ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh -endif -endif LOCAL_GENERATED_SOURCES := $(TWRP_RES_GEN) LOCAL_SRC_FILES := twrp $(TWRP_RES_GEN) |