DO NOT MERGE Android 8.0 stuff
Change-Id: I8c8a9734adbf36c33463123844fa6e078934ae34
diff --git a/toolbox/Android.mk b/toolbox/Android.mk
index 45edd01..b8f4d2e 100644
--- a/toolbox/Android.mk
+++ b/toolbox/Android.mk
@@ -47,14 +47,14 @@
$(if $(filter $(PLATFORM_SDK_VERSION), 23 24), du)
OUR_TOOLS := \
- iftop \
- ioctl \
- nandread \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; iftop),) \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; ioctl),) \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; nandread),) \
newfs_msdos \
- prlimit \
- sendevent \
- start \
- stop \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; prlimit),) \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; sendevent),) \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; start),) \
+ $(if $(shell test $(PLATFORM_SDK_VERSION) -lt 26; stop),) \
ifneq (,$(filter $(PLATFORM_SDK_VERSION), 23))
BSD_TOOLS += \