commit bb2532130c1c52755916d8608b7057496c6b395a
author Marco Nelissen <marcone@google.com> Mon Nov 22 15:58:23 2010 -0800
committer Marco Nelissen <marcone@google.com> Mon Nov 22 16:14:11 2010 -0800
tree e3d2b0dce0324688825283853975a462ad72e97d
parent 4d7f623096baf10fce592995cd959f28e56f4593

Fix the libcore part of the simulator build.

Change-Id: Id7af848e09c27006a566e6600793f45364e943d3

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index 37cf8db..238a875 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -94,10 +94,10 @@
 
 # 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)
 
 ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_C_INCLUDES += external/stlport/stlport
+LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
 endif
 
 LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)