resolved conflicts for merge of 18fb450a to dalvik-dev
Change-Id: I5f7884af56908adbdb9b9ab5799b5b7d0f7f51cc
diff --git a/NativeCode.mk b/NativeCode.mk
index 57c2457..00bfba7 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -94,11 +94,17 @@
# Define the rules.
LOCAL_SRC_FILES := $(core_src_files)
-LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include external/stlport/stlport
-LOCAL_SHARED_LIBRARIES := $(core_shared_libraries) libstlport
+LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include
+LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)
LOCAL_STATIC_LIBRARIES := $(core_static_libraries)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := libjavacore
+
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_C_INCLUDES += external/stlport/stlport
+LOCAL_SHARED_LIBRARIES += libstlport
+endif
+
include $(BUILD_STATIC_LIBRARY)
# Deal with keystores required for security. Note: The path to this file