Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a8a7ceb authored by Ethan Yonker's avatar Ethan Yonker Committed by Dees Troy
Browse files

Fix adb shell in 7.0 tree 

busybox sh does not seem to work properly in 7.0 trees so use
mksh for sh instead.

Change-Id: Ia33bc3894f929b1348c8714d4ddd00a2671c7e94
parent 93ac7a0b

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,9 @@ include $(CLEAR_VARS) 
# Create busybox symlinks... gzip and gunzip are excluded because those need to link to pigz instead

BUSYBOX_LINKS := $(shell cat external/busybox/busybox-full.links)

exclude := tune2fs mke2fs mkdosfs mkfs.vfat gzip gunzip

ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)

    exclude += sh

endif



# Having /sbin/modprobe present on 32 bit devices with can cause a massive

# performance problem if the kernel has CONFIG_MODULES=y

gui/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -173,7 +173,9 @@ $(TWRP_RES_GEN): 
	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

	ln -sf /sbin/pigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gzip

	ln -sf /sbin/unpigz $(TARGET_RECOVERY_ROOT_OUT)/sbin/gunzip

prebuilt/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/erase_image 
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/bu

ifneq ($(TW_USE_TOOLBOX), true)

	RELINK_SOURCE_FILES += $(TARGET_OUT_OPTIONAL_EXECUTABLES)/busybox

	ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 24; echo $$?),0)

		RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/sh

	endif

else

	RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/sh

	RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcrypto.so