Remove the simulator target from all makefiles.

Bug: 5010576

Change-Id: Ifb59ea7e454d8ce832610e0979935e889e7621e2

diff --git a/mock-ril/Android.mk b/mock-ril/Android.mk
index 00cfc38..540bf89 100644 (file)
--- a/mock-ril/Android.mk
+++ b/mock-ril/Android.mk
@@ -45,11 +45,8 @@ 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
 
 # __BSD_VISIBLE for htolexx macros.
 LOCAL_STRIP_MODULE := true