summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-12-01 19:13:09 -0800
committerJean-Baptiste Queru <jbq@google.com>2009-12-01 19:13:09 -0800
commitedac9050e2c3239d294f9039c54a31058ab0a783 (patch)
tree071523a5bcddc075a725509f1a2da05315d23e9d /Android.mk
parentafa94bcc85b11e170818a896b14f38521d11d333 (diff)
downloadexternal_webkit-edac9050e2c3239d294f9039c54a31058ab0a783.zip
external_webkit-edac9050e2c3239d294f9039c54a31058ab0a783.tar.gz
external_webkit-edac9050e2c3239d294f9039c54a31058ab0a783.tar.bz2
Revert "Don't use the WebKit STL when building the simulator"
This reverts commit afa94bcc85b11e170818a896b14f38521d11d333.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index ddccd1b..942043a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -211,12 +211,8 @@ 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
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
+ $(LOCAL_PATH)/WebKit/android/plugins \
$(LOCAL_PATH)/WebKit/android/stl
-endif
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/JavaScriptCore \