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
---
 gui/Android.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/Android.mk b/gui/Android.mk
index 84f890ca7..40e0cd936 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -70,7 +70,11 @@ ifeq ($(TW_ROUND_SCREEN), true)
     LOCAL_CFLAGS += -DTW_ROUND_SCREEN
 endif
 
-LOCAL_C_INCLUDES += bionic external/stlport/stlport system/core/libpixelflinger/include
+LOCAL_C_INCLUDES += bionic system/core/libpixelflinger/include
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
+    LOCAL_C_INCLUDES += external/stlport/stlport
+endif
+
 LOCAL_CFLAGS += -DTWRES=\"$(TWRES_PATH)\"
 
 include $(BUILD_STATIC_LIBRARY)
-- 
cgit v1.2.3