From 0af1ac13d16ede841ef6f16c859c24f8f1e3d16f Mon Sep 17 00:00:00 2001
From: Xing <xing@Xings-iMac.local>
Date: Fri, 27 Nov 2015 11:19:37 -0800
Subject: do not include stlport headers unless link to it

Change-Id: I8344d270ddb601694b5fef0fa7b22ea437030728
---
 mtp/Android.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'mtp/Android.mk')

diff --git a/mtp/Android.mk b/mtp/Android.mk
index 38d31aea4..57f0ae35e 100755
--- a/mtp/Android.mk
+++ b/mtp/Android.mk
@@ -7,7 +7,11 @@ include $(CLEAR_VARS)
 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 @@ LOCAL_SRC_FILES = \
     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++
-- 
cgit v1.2.3