Skip stlport for simulator

The host's stl library conflicts with stlport, so we need to exclude
stlport from inclusion in the build if we're targeting the simulator.

Change-Id: Idde6453687870a4e361d6a537482fe09dc2fdb47

diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index b804125..680560d 100644 (file)
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \
     mock-ril.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-    libcutils libutils libril libstlport
+    libcutils libutils libril
 
 LOCAL_STATIC_LIBRARIES := \
     libprotobuf-cpp-2.3.0-lite
@@ -19,9 +19,14 @@ LOCAL_CFLAGS := -D_GNU_SOURCE -UNDEBUG -DGOOGLE_PROTOBUF_NO_RTTI
 LOCAL_C_INCLUDES := \
     external/protobuf/src \
     bionic \
-    external/stlport/stlport \
     $(KERNEL_HEADERS)
 
+# stlport conflicts with the host stl library
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_SHARED_LIBRARIES += libstlport
+LOCAL_C_INCLUDES += external/stlport/stlport
+endif
+
 # build shared library but don't require it be prelinked
 LOCAL_PRELINK_MODULE := false
 LOCAL_LDLIBS += -lpthread