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

Commit a52891b6 authored by Captain Throwback's avatar Captain Throwback Committed by Dees Troy
Browse files

Revert "Fix adb shell in 7.0 tree" 

This reverts commit 0a8a7ceb.

Change-Id: Icdb1f2e93aeaf35a66b6f67eaff51d9af5fd2e9a
parent 3184b2f7

Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -510,9 +510,6 @@ 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

prebuilt/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 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