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

twrpTarMain/Android.mk

diff --git a/twrpTarMain/Android.mk b/twrpTarMain/Android.mk
index 5f15bf0..5a1a443 100644
--- a/twrpTarMain/Android.mk
+++ b/twrpTarMain/Android.mk
@@ -11,8 +11,15 @@
 	../twrpDU.cpp
 LOCAL_CFLAGS:= -g -c -W -DBUILD_TWRPTAR_MAIN
 
-LOCAL_C_INCLUDES += bionic external/stlport/stlport
-LOCAL_STATIC_LIBRARIES := libc libtar_static libstlport_static libstdc++
+LOCAL_C_INCLUDES += bionic
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
+    LOCAL_C_INCLUDES += external/stlport/stlport
+endif
+
+LOCAL_STATIC_LIBRARIES := libc libtar_static libstdc++
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23; echo $$?),0)
+    LOCAL_STATIC_LIBRARIES += libstlport_static
+endif
 
 ifeq ($(TWHAVE_SELINUX), true)
     LOCAL_C_INCLUDES += external/libselinux/include