commit 0a8a7cebf154f7062174c4fac4a9c836038fbfbc
author Ethan Yonker <dees_troy@teamw.in> Mon Nov 07 22:00:06 2016 -0600
committer Dees Troy <dees_troy@teamw.in> Wed Nov 30 16:47:20 2016 +0100
tree 2d0cb1e3fa0ec58fa70d87c69a6133f80ba69f59
parent 93ac7a0bb1ff07f3357009b5198c3b88cc8bbb90

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

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 169f87f..a81781b 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -17,6 +17,9 @@
 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