From 6567c2a19dd910c1f036bc638bab106fd6350e96 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 15:15:13 +0100 Subject: Merge Webkit at r65072 : Fix Makefiles. Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf --- JavaScriptCore/Android.mk | 3 +++ WebCore/Android.derived.jscbindings.mk | 3 --- WebCore/Android.derived.v8bindings.mk | 3 --- WebCore/Android.jscbindings.mk | 6 ------ WebCore/Android.mk | 7 +++---- WebCore/Android.v8bindings.mk | 7 ------- 6 files changed, 6 insertions(+), 23 deletions(-) diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 09af86e..959fbc4 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -28,6 +28,8 @@ LOCAL_SRC_FILES := \ API/JSCallbackObject.cpp \ API/OpaqueJSString.cpp \ \ + assembler/ARMv7Assembler.cpp \ + \ bytecode/CodeBlock.cpp \ bytecode/JumpTable.cpp \ bytecode/Opcode.cpp \ @@ -98,6 +100,7 @@ LOCAL_SRC_FILES := \ runtime/Executable.cpp \ runtime/FunctionConstructor.cpp \ runtime/FunctionPrototype.cpp \ + runtime/GCActivityCallback.cpp \ runtime/GCHandle.cpp \ runtime/GetterSetter.cpp \ runtime/GlobalEvalFunction.cpp \ diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk index 7492522..b8ec138 100644 --- a/WebCore/Android.derived.jscbindings.mk +++ b/WebCore/Android.derived.jscbindings.mk @@ -106,11 +106,8 @@ GEN := \ $(intermediates)/dom/JSDOMCoreException.h \ $(intermediates)/dom/JSDOMImplementation.h \ $(intermediates)/dom/JSDOMStringList.h \ -<<<<<<< HEAD $(intermediates)/dom/JSDOMStringMap.h \ -======= $(intermediates)/dom/JSDeviceMotionEvent.h \ ->>>>>>> webkit.org at r65072 $(intermediates)/dom/JSDeviceOrientationEvent.h \ $(intermediates)/dom/JSDocument.h \ $(intermediates)/dom/JSDocumentFragment.h \ diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index e5ea4db..bbdd67d 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -89,11 +89,8 @@ GEN := \ $(intermediates)/bindings/V8DOMCoreException.h \ $(intermediates)/bindings/V8DOMImplementation.h \ $(intermediates)/bindings/V8DOMStringList.h \ -<<<<<<< HEAD $(intermediates)/bindings/V8DOMStringMap.h \ -======= $(intermediates)/bindings/V8DeviceMotionEvent.h \ ->>>>>>> webkit.org at r65072 $(intermediates)/bindings/V8DeviceOrientationEvent.h \ $(intermediates)/bindings/V8Document.h \ $(intermediates)/bindings/V8DocumentFragment.h \ diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index 04cea04..20e9161 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -95,11 +95,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSDOMWrapper.cpp \ bindings/js/JSDataGridColumnListCustom.cpp \ bindings/js/JSDataGridDataSource.cpp \ -<<<<<<< HEAD - bindings/js/JSDatabaseCustom.cpp \ - bindings/js/JSDatabaseSyncCustom.cpp \ -======= ->>>>>>> webkit.org at r65072 bindings/js/JSDedicatedWorkerContextCustom.cpp \ bindings/js/JSDesktopNotificationsCustom.cpp \ bindings/js/JSDeviceMotionEventCustom.cpp \ @@ -172,7 +167,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSXMLHttpRequestUploadCustom.cpp \ bindings/js/JSXSLTProcessorCustom.cpp \ bindings/js/ScheduledAction.cpp \ - bindings/js/ScriptArray.cpp \ bindings/js/ScriptCachedFrameData.cpp \ bindings/js/ScriptCallFrame.cpp \ bindings/js/ScriptCallStack.cpp \ diff --git a/WebCore/Android.mk b/WebCore/Android.mk index 2b627eb..56f3055 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -24,6 +24,7 @@ ## LOCAL_SRC_FILES := \ + bindings/generic/ActiveDOMCallback.cpp \ bindings/generic/BindingSecurityBase.cpp \ bindings/generic/RuntimeEnabledFeatures.cpp \ \ @@ -164,11 +165,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ dom/DeviceOrientationEvent.cpp \ dom/OverflowEvent.cpp \ dom/PageTransitionEvent.cpp \ -<<<<<<< HEAD - dom/PopStateEvent.cpp \ -======= dom/PendingScript.cpp \ ->>>>>>> webkit.org at r65072 + dom/PopStateEvent.cpp \ dom/Position.cpp \ dom/PositionIterator.cpp \ dom/ProcessingInstruction.cpp \ @@ -444,6 +442,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/KillRingNone.cpp \ platform/Length.cpp \ platform/LinkHash.cpp \ + platform/LocalizedStrings.cpp \ platform/Logging.cpp \ platform/MIMETypeRegistry.cpp \ platform/SchemeRegistry.cpp \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 4291276..7ac9111 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -54,7 +54,6 @@ LOCAL_SRC_FILES += \ bindings/v8/NPV8Object.cpp \ bindings/v8/ScheduledAction.cpp \ bindings/v8/ScopedDOMDataStore.cpp \ - bindings/v8/ScriptArray.cpp \ bindings/v8/ScriptCachedFrameData.cpp \ bindings/v8/ScriptCallFrame.cpp \ bindings/v8/ScriptCallStack.cpp \ @@ -114,12 +113,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8DOMFormDataCustom.cpp \ bindings/v8/custom/V8DOMWindowCustom.cpp \ bindings/v8/custom/V8DataGridColumnListCustom.cpp \ -<<<<<<< HEAD - bindings/v8/custom/V8DatabaseCustom.cpp \ - bindings/v8/custom/V8DatabaseSyncCustom.cpp \ -======= - bindings/v8/custom/V8DatabaseCallback.cpp \ ->>>>>>> webkit.org at r65072 bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \ bindings/v8/custom/V8DeviceMotionEventCustom.cpp \ bindings/v8/custom/V8DeviceOrientationEventCustom.cpp \ -- cgit v1.1