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

Android.mk

diff --git a/Android.mk b/Android.mk
index 8456e84..a73311e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -478,6 +478,9 @@
 # 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