Revert "Fix adb shell in 7.0 tree"
This reverts commit 0a8a7cebf154f7062174c4fac4a9c836038fbfbc.
Change-Id: Icdb1f2e93aeaf35a66b6f67eaff51d9af5fd2e9a
diff --git a/Android.mk b/Android.mk
index 335a2d4..5a37b62 100644
--- a/Android.mk
+++ b/Android.mk
@@ -510,9 +510,6 @@
# 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
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index e34889e..2a963f1 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -17,9 +17,6 @@
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