summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--toolbox/Android.mk24
-rw-r--r--toybox/Android.mk11
2 files changed, 20 insertions, 15 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 916080213..45edd01c7 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -44,30 +44,32 @@ ifeq ($(TW_USE_TOOLBOX), true)
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
# These are the only toolbox tools in M. The rest are now in toybox.
BSD_TOOLS := \
- dd \
- du \
+ $(if $(filter $(PLATFORM_SDK_VERSION), 23 24), du)
OUR_TOOLS := \
iftop \
ioctl \
- log \
nandread \
newfs_msdos \
- ps \
prlimit \
sendevent \
start \
stop \
- top \
- ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 25; echo $$?),0)
+ ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23))
+ BSD_TOOLS += \
+ dd \
+
OUR_TOOLS += \
df \
ionice \
+ log \
ls \
lsof \
mount \
+ ps \
renice \
+ top \
uptime \
watchprops
endif
@@ -213,19 +215,19 @@ ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22 23))
LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS))
endif
-ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23 24))
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
# Rule to make getprop and setprop in M trees where toybox normally
# provides these tools. Toybox does not allow for easy dynamic
# configuration, so we would have to include the entire toybox binary
# which takes up more space than is necessary so long as we are still
# including busybox.
+ifneq ($(TW_USE_TOOLBOX), true)
LOCAL_SRC_FILES += \
../../../$(TWRP_TOOLBOX_PATH)/getprop.c \
- ../../../$(TWRP_TOOLBOX_PATH)/setprop.c
+ ../../../$(TWRP_TOOLBOX_PATH)/setprop.c \
+ ../../../$(TWRP_TOOLBOX_PATH)/ls.c
OUR_TOOLS += getprop setprop
- ifneq ($(TW_USE_TOOLBOX), true)
- LOCAL_SRC_FILES += ../../../$(TWRP_TOOLBOX_PATH)/ls.c
- endif
+endif
endif
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
# Rule for making start and stop in N trees
diff --git a/toybox/Android.mk b/toybox/Android.mk
index b34c2c301..c4f0395f7 100644
--- a/toybox/Android.mk
+++ b/toybox/Android.mk
@@ -190,8 +190,8 @@ LOCAL_SRC_FILES := \
toys/posix/wc.c \
toys/posix/xargs.c
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 24; echo $$?),0)
-# there are some conflicts here with AOSP-7.1 and CM-14.1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
+# there are some conflicts here with AOSP-7.[01] and CM-14.[01]
# the following items have been removed for compatibility
# ifconfig, netcat, netstat, rfkill, switch_root
LOCAL_STATIC_LIBRARIES := libcrypto_static
@@ -408,7 +408,7 @@ ALL_TOOLS := \
xargs \
yes
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 24; echo $$?),0)
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 23; echo $$?),0)
ALL_TOOLS += \
arp \
base64 \
@@ -416,7 +416,6 @@ ALL_TOOLS += \
dd \
df \
diff \
- du \
egrep \
fgrep \
flock \
@@ -469,6 +468,10 @@ ALL_TOOLS += \
watch \
xxd \
xzcat
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 24; echo $$?),0)
+ALL_TOOLS += \
+ du
+endif
# Account for master branch changes pulld into CM14.1
ifneq ($(CM_BUILD),)
ALL_TOOLS += \