From 9ce12ec20d8655fe602de91de8152bba07d7054c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=2E=20Andrei=20M=C4=83ce=C8=99?= <dmaces@nd.edu>
Date: Thu, 22 Dec 2016 17:14:21 -0500
Subject: build: [FIXUP] Addendum for BusyBox get/setprop & API 24 vs 25

Change-Id: I9c909bc990210fc3ec2ed3edf0ac106248f613ba
---
 toybox/Android.mk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'toybox/Android.mk')

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 += \
-- 
cgit v1.2.3