diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-06 13:20:18 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 14:57:11 +0100 |
| commit | 808efddb145d485fdb8202437578f218340124b2 (patch) | |
| tree | 102bb6fc821cc0a8d2e52718c77b483292663fe3 /Source/WebCore/Android.v8bindings.mk | |
| parent | bbcce278be9be6a85f47928c38a74c8d36a13a85 (diff) | |
| download | external_webkit-808efddb145d485fdb8202437578f218340124b2.zip external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.gz external_webkit-808efddb145d485fdb8202437578f218340124b2.tar.bz2 | |
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
Diffstat (limited to 'Source/WebCore/Android.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index 791d8d4..e196bdd 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -157,7 +157,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8MessageChannelConstructor.cpp \ bindings/v8/custom/V8MessagePortCustom.cpp \ bindings/v8/custom/V8MessageEventCustom.cpp \ - bindings/v8/custom/V8NavigatorCustom.cpp \ bindings/v8/custom/V8NamedNodeMapCustom.cpp \ bindings/v8/custom/V8NamedNodesCollection.cpp \ bindings/v8/custom/V8NavigatorCustom.cpp \ @@ -200,10 +199,9 @@ LOCAL_SRC_FILES += \ bridge/jni/JavaMethodJobject.cpp \ bridge/jni/JobjectWrapper.cpp \ bridge/jni/v8/JNIUtilityPrivate.cpp \ -<<<<<<< HEAD - bridge/jni/v8/JavaClassV8.cpp \ - bridge/jni/v8/JavaFieldV8.cpp \ - bridge/jni/v8/JavaInstanceV8.cpp \ + bridge/jni/v8/JavaClassJobjectV8.cpp \ + bridge/jni/v8/JavaFieldJobjectV8.cpp \ + bridge/jni/v8/JavaInstanceJobjectV8.cpp \ bridge/jni/v8/JavaNPObjectV8.cpp # For XPath. @@ -213,10 +211,3 @@ LOCAL_SRC_FILES += \ # For XSLT. LOCAL_SRC_FILES += \ bindings/v8/custom/V8XSLTProcessorCustom.cpp -======= - bridge/jni/v8/JavaClassJobjectV8.cpp \ - bridge/jni/v8/JavaFieldJobjectV8.cpp \ - bridge/jni/v8/JavaInstanceJobjectV8.cpp \ - bridge/jni/v8/JavaNPObject.cpp \ - bridge/jni/v8/JobjectWrapper.cpp ->>>>>>> WebKit.org at r84325 |