summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-12-01 14:35:03 -0800
committerJean-Baptiste Queru <jbq@google.com>2009-12-01 14:35:03 -0800
commitafa94bcc85b11e170818a896b14f38521d11d333 (patch)
tree24e1518bacb9555c2df0e1251aa32b2db9e5464b
parent2420edd43645681f6b6f4ea17a65e710bd64d1db (diff)
downloadexternal_webkit-afa94bcc85b11e170818a896b14f38521d11d333.zip
external_webkit-afa94bcc85b11e170818a896b14f38521d11d333.tar.gz
external_webkit-afa94bcc85b11e170818a896b14f38521d11d333.tar.bz2
Don't use the WebKit STL when building the simulator
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 942043a..ddccd1b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -211,8 +211,12 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(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 \