diff options
Diffstat (limited to 'Source/WebCore/Android.jscbindings.mk')
| -rw-r--r-- | Source/WebCore/Android.jscbindings.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk index 697f5ef..281425c 100644 --- a/Source/WebCore/Android.jscbindings.mk +++ b/Source/WebCore/Android.jscbindings.mk @@ -113,7 +113,11 @@ LOCAL_SRC_FILES += \ bindings/js/JSDirectoryEntrySyncCustom.cpp \ bindings/js/JSDocumentCustom.cpp \ bindings/js/JSElementCustom.cpp \ +<<<<<<< HEAD bindings/js/JSEntrySyncCustom.cpp \ +======= + bindings/js/JSErrorHandler.cpp \ +>>>>>>> WebKit.org at r76408 bindings/js/JSEventCustom.cpp \ bindings/js/JSEventListener.cpp \ bindings/js/JSEventTarget.cpp \ @@ -187,7 +191,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSWebKitPointCustom.cpp \ bindings/js/JSWorkerContextBase.cpp \ bindings/js/JSWorkerContextCustom.cpp \ - bindings/js/JSWorkerContextErrorHandler.cpp \ bindings/js/JSWorkerCustom.cpp \ bindings/js/JSXMLHttpRequestCustom.cpp \ bindings/js/JSXMLHttpRequestUploadCustom.cpp \ |