summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorHashcode <hashcode0f@gmail.com>2016-12-20 01:30:49 +0100
committerD. Andrei Măceș <dmaces@nd.edu>2017-01-12 18:50:18 +0100
commit57332151129716bf6edf2792226ae4f1622fa93b (patch)
tree44c4da94ae756baa93af46b1c594d806c8822f45 /toolbox
parentupdater: link libcrypto_utils_static if it exist (diff)
downloadandroid_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar.gz
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar.bz2
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar.lz
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar.xz
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.tar.zst
android_bootable_recovery-57332151129716bf6edf2792226ae4f1622fa93b.zip
Diffstat (limited to '')
-rw-r--r--toolbox/Android.mk21
1 files changed, 12 insertions, 9 deletions
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 4c3e433c2..07e47389d 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -50,26 +50,29 @@ ifeq ($(TW_USE_TOOLBOX), true)
du \
OUR_TOOLS := \
- df \
iftop \
ioctl \
- ionice \
log \
- ls \
- lsof \
- mount \
nandread \
newfs_msdos \
ps \
prlimit \
- renice \
sendevent \
start \
stop \
top \
- uptime \
- watchprops \
+ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 25; echo $$?),0)
+ OUR_TOOLS += \
+ df \
+ ionice \
+ ls \
+ lsof \
+ mount \
+ renice \
+ uptime \
+ watchprops
+ endif
else
ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22))
OUR_TOOLS += \
@@ -217,7 +220,7 @@ ifneq (,$(filter $(PLATFORM_SDK_VERSION), 21 22 23))
LOCAL_WHOLE_STATIC_LIBRARIES := $(patsubst %,libtoolbox_%,$(BSD_TOOLS))
endif
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0)
+ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23 24))
# 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