commit 0af1ac13d16ede841ef6f16c859c24f8f1e3d16f
author Xing <xing@Xings-iMac.local> Fri Nov 27 11:19:37 2015 -0800
committer Dees Troy <dees_troy@teamw.in> Wed Dec 23 22:36:41 2015 +0200
tree 0dff623b6466f5f2aed2c2bc02bcb12f1448a461
parent 4251a9bcff9dfd4d857d92c67e46c3a464675fe0

do not include stlport headers unless link to it

Change-Id: I8344d270ddb601694b5fef0fa7b22ea437030728

mtp/Android.mk

diff --git a/mtp/Android.mk b/mtp/Android.mk
index 38d31ae..57f0ae3 100755
--- a/mtp/Android.mk
+++ b/mtp/Android.mk
@@ -7,7 +7,11 @@
 LOCAL_MODULE := libtwrpmtp
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -DMTP_DEVICE -DMTP_HOST -fno-strict-aliasing
-LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic external/stlport/stlport frameworks/base/include system/core/include bionic/libc/private/
+LOCAL_C_INCLUDES += $(LOCAL_PATH) bionic frameworks/base/include system/core/include bionic/libc/private/
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
+    LOCAL_C_INCLUDES += external/stlport/stlport
+endif
+
 LOCAL_SRC_FILES = \
     btree.cpp \
     MtpDataPacket.cpp \
@@ -31,7 +35,7 @@
     node.cpp
 LOCAL_SHARED_LIBRARIES += libz libc libusbhost libstdc++ libdl libcutils libutils libaosprecovery
 
-ifeq (,$(filter $(PLATFORM_SDK_VERSION), 23))
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
     LOCAL_SHARED_LIBRARIES += libstlport
 else
     LOCAL_SHARED_LIBRARIES += libc++