From 0c9d049b6ee2292b29e5fa8c5c500672a38e61a4 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 14 Apr 2014 09:10:05 -0500 Subject: Improve handling of shell symlink in recovery ramdisk Change-Id: I06351f8ecdfe5b119bbae0d6800258adef844c66 --- gui/Android.mk | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gui') diff --git a/gui/Android.mk b/gui/Android.mk index 6134e3b57..1ddab5e33 100644 --- a/gui/Android.mk +++ b/gui/Android.mk @@ -101,26 +101,21 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/res TWRP_RES_LOC := $(commands_recovery_local_path)/gui/devices TWRP_RES_GEN := $(intermediates)/twrp - ifneq ($(TW_USE_TOOLBOX), true) -$(TWRP_RES_GEN): - mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res/ - cp -fr $(TWRP_RES_LOC)/common/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ - cp -fr $(TWRP_RES_LOC)/$(DEVICE_RESOLUTION)/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ - mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/ - ln -sf /sbin/busybox $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh - ln -sf /sbin/pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip - ln -sf /sbin/unpigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gunzip + TWRP_SH_TARGET := /sbin/busybox else + TWRP_SH_TARGET := /sbin/mksh +endif + $(TWRP_RES_GEN): mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res/ cp -fr $(TWRP_RES_LOC)/common/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ cp -fr $(TWRP_RES_LOC)/$(DEVICE_RESOLUTION)/res/* $(TARGET_RECOVERY_ROOT_OUT)/res/ mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/sbin/ - ln -sf /sbin/mksh $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh + ln -sf $(TWRP_SH_TARGET) $(TARGET_RECOVERY_ROOT_OUT)/sbin/sh ln -sf /sbin/pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip ln -sf /sbin/unpigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gunzip -endif + LOCAL_GENERATED_SOURCES := $(TWRP_RES_GEN) LOCAL_SRC_FILES := twrp $(TWRP_RES_GEN) -- cgit v1.2.3