Merge "Use memmove instead of memcpy in string::assign."
diff --git a/Android.mk b/Android.mk
index a86a796..7e70b14 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,3 @@
-# We cannot use stlport on the simulator because it conficts with the host stl
-# library. Android's port also relies on bionic which is not built for the
-# simulator either.
-ifneq ($(TARGET_SIMULATOR),true)
LOCAL_PATH := $(call my-dir)
libstlport_src_files := \
@@ -76,5 +72,3 @@
include $(LOCAL_PATH)/libstlport.mk
include $(BUILD_STATIC_LIBRARY)
-
-endif
diff --git a/libstlport.mk b/libstlport.mk
index 3cbe61f..f9d696f 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -1,10 +1,5 @@
# Add a couple include paths to use stlport.
-# Only use this on the device or emulator.
-ifeq ($(TARGET_SIMULATOR),true)
-$(error STLPort not suitable for the simulator! $(LOCAL_PATH))
-endif
-
ifdef LOCAL_NDK_VERSION
stlport_NDK_VERSION_ROOT := $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r$(LOCAL_NDK_VERSION)/platforms/android-$(LOCAL_SDK_VERSION)/arch-$(TARGET_ARCH)
LOCAL_C_INCLUDES := \
