Remove the simulator target from all makefiles.

[android-x86/hardware-ril.git] / mock-ril / Android.mk

diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index e99a0aa..540bf89 100644 (file)
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -45,16 +45,12 @@ LOCAL_C_INCLUDES := \
     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