OSDN Git Service

Revert "Don't use the WebKit STL when building the simulator"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 2 Dec 2009 03:13:09 +0000 (19:13 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 2 Dec 2009 03:13:09 +0000 (19:13 -0800)
This reverts commit afa94bcc85b11e170818a896b14f38521d11d333.

Android.mk

index ddccd1b..942043a 100644 (file)
@@ -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 \