am d8ad6c98: resolved conflicts for merge of 988d3d71 to honeycomb-plus-aosp
* commit 'd8ad6c98086c410243e0e8ad8285f02d6b696bd6':
Enable QEMUD pipe connection
diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index e99a0aa..540bf89 100644
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -45,16 +45,12 @@
bionic \
$(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
# __BSD_VISIBLE for htolexx macros.
LOCAL_STRIP_MODULE := true
-LOCAL_PRELINK_MODULE := false
+
LOCAL_LDLIBS += -lpthread
LOCAL_CFLAGS += -DMOCK_RIL -D__BSD_VISIBLE
LOCAL_PROTOC_OPTIMIZE_TYPE := full
