OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afa94bc
)
Revert "Don't use the WebKit STL when building the simulator"
author
Jean-Baptiste Queru
<jbq@google.com>
Wed, 2 Dec 2009 03:13:09 +0000
(19:13 -0800)
committer
Jean-Baptiste Queru
<jbq@google.com>
Wed, 2 Dec 2009 03:13:09 +0000
(19:13 -0800)
This reverts commit
afa94bcc85b11e170818a896b14f38521d11d333
.
Android.mk
patch
|
blob
|
history
diff --git
a/Android.mk
b/Android.mk
index
ddccd1b
..
942043a
100644
(file)
--- 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 \