summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index d14a441..5d3fc06 100644
--- a/Android.mk
+++ b/Android.mk
@@ -186,11 +186,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libcutils libutils
-# stlport conflicts with the host stl library
-ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
-endif
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \
@@ -252,11 +249,8 @@ LOCAL_C_INCLUDES := \
LOCAL_SHARED_LIBRARIES := \
libz libcutils libutils
-# stlport conflicts with the host stl library
-ifneq ($(TARGET_SIMULATOR),true)
LOCAL_C_INCLUDES += external/stlport/stlport
LOCAL_SHARED_LIBRARIES += libstlport
-endif
# Define the header files to be copied
#LOCAL_COPY_HEADERS := \