commit d501410a90f09d186dc0ba1c8ecbe90a9b36a8ec
author Brian Carlstrom <bdc@google.com> Mon Nov 22 17:09:14 2010 -0800
committer Brian Carlstrom <bdc@google.com> Mon Nov 22 17:09:14 2010 -0800
tree a94dfeedb46ae2fa8ca6ec9cf5e2ab83fab2fa71
parent 842c3996cbaef90c76b756291ce7f2c57b349623
parent bb2532130c1c52755916d8608b7057496c6b395a

resolved conflicts for merge of bb253213 to dalvik-dev

Change-Id: I12581fd722a67fd43c5d366327af2bb0ce0dd8e0

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 00bfba7..b5cc769 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -94,14 +94,14 @@
 
 # Define the rules.
 LOCAL_SRC_FILES := $(core_src_files)
-LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include 
+LOCAL_C_INCLUDES := $(core_c_includes)
 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_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include 
 LOCAL_SHARED_LIBRARIES += libstlport
 endif