From 0a8a7cebf154f7062174c4fac4a9c836038fbfbc Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Mon, 7 Nov 2016 22:00:06 -0600
Subject: 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
---
 prebuilt/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'prebuilt')

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 169f87f89..a81781bf7 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -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
-- 
cgit v1.2.3