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

gui/Android.mk

diff --git a/gui/Android.mk b/gui/Android.mk
index 84f890c..40e0cd9 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -70,7 +70,11 @@
     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)