commit afa94bcc85b11e170818a896b14f38521d11d333
author Jean-Baptiste Queru <jbq@google.com> Tue Dec 01 14:35:03 2009 -0800
committer Jean-Baptiste Queru <jbq@google.com> Tue Dec 01 14:35:03 2009 -0800
tree 24e1518bacb9555c2df0e1251aa32b2db9e5464b
parent 2420edd43645681f6b6f4ea17a65e710bd64d1db

Don't use the WebKit STL when building the simulator

Android.mk

diff --git a/Android.mk b/Android.mk
index 942043a..ddccd1b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -211,8 +211,12 @@
 	$(LOCAL_PATH)/WebKit/android/WebCoreSupport \
 	$(LOCAL_PATH)/WebKit/android/jni \
 	$(LOCAL_PATH)/WebKit/android/nav \
-	$(LOCAL_PATH)/WebKit/android/plugins \
+	$(LOCAL_PATH)/WebKit/android/plugins
+
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/WebKit/android/stl
+endif
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 	$(LOCAL_PATH)/JavaScriptCore \