commit 18fb450a3043d52ff6c134ff901987f4d3a9af96
author Kristian Monsen <kristianm@google.com> Fri Nov 19 17:22:58 2010 +0000
committer Kristian Monsen <kristianm@google.com> Fri Nov 19 17:22:58 2010 +0000
tree f8d04c70eb1c36e126ecc5e296b0114a9b8d9535
parent 26e0cc02e3ddd5e77e5c99984e7b50de6f5a4aad

Fix for simulator build, no stlport in simulator

Change-Id: I2c2e8f443ddad6b65a29b2fd6ba1ff1d6e76fafc

NativeCode.mk

diff --git a/NativeCode.mk b/NativeCode.mk
index a342380..37cf8db 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -94,7 +94,12 @@
 
 # Define the rules.
 LOCAL_SRC_FILES := $(core_src_files)
-LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include external/stlport/stlport
+LOCAL_C_INCLUDES := $(core_c_includes) bionic/ bionic/libstdc++/include 
+
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_C_INCLUDES += external/stlport/stlport
+endif
+
 LOCAL_SHARED_LIBRARIES := $(core_shared_libraries)
 LOCAL_STATIC_LIBRARIES := $(core_static_libraries)
 LOCAL_MODULE_TAGS := optional