summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-11 22:12:04 -0700
committerJeff Brown <jeffbrown@google.com>2011-07-11 22:12:04 -0700
commite217977611c52bccde7f7c78e1d3c790c6357431 (patch)
tree85924a9262c7bfdcbd1e63c400b78cbad0629f4a /Android.mk
parent8a2f7578bb6289415f1d0a01c9cc96d283730480 (diff)
downloadexternal_protobuf-e217977611c52bccde7f7c78e1d3c790c6357431.zip
external_protobuf-e217977611c52bccde7f7c78e1d3c790c6357431.tar.gz
external_protobuf-e217977611c52bccde7f7c78e1d3c790c6357431.tar.bz2
Bug: 5010576 Change-Id: I9a5e66066482aa0007f221bb866ac57f4eb1b70c
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 := \