Merge webkit.org at r51976 : Fix conflicts in Makefiles.

Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858
and http://trac.webkit.org/changeset/51926

Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad

5 files changed, 0 insertions, 104 deletions

diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index a589bba..2eb19f5 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -49,11 +49,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
 			bindings/scripts/generate-bindings.pl \
 		)
 
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
 FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
-=======
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
 
 # CSS
 GEN := \
@@ -136,12 +132,9 @@ GEN := \
     $(intermediates)/dom/JSRangeException.h \
     $(intermediates)/dom/JSText.h \
     $(intermediates)/dom/JSTextEvent.h \
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/dom/JSTouch.h \
     $(intermediates)/dom/JSTouchEvent.h \
     $(intermediates)/dom/JSTouchList.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/dom/JSTreeWalker.h \
     $(intermediates)/dom/JSUIEvent.h \
     $(intermediates)/dom/JSWebKitAnimationEvent.h \
@@ -252,7 +245,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/htm
 
 # Canvas
 GEN := \
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasActiveInfo.h \
     $(intermediates)/html/canvas/JSCanvasArray.h \
     $(intermediates)/html/canvas/JSCanvasArrayBuffer.h \
@@ -260,22 +252,13 @@ GEN := \
     $(intermediates)/html/canvas/JSCanvasByteArray.h \
     $(intermediates)/html/canvas/JSCanvasFloatArray.h \
     $(intermediates)/html/canvas/JSCanvasFramebuffer.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasGradient.h \
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasIntArray.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasNumberArray.h \
     $(intermediates)/html/canvas/JSCanvasPattern.h \
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasProgram.h \
     $(intermediates)/html/canvas/JSCanvasRenderbuffer.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasRenderingContext.h \
-<<<<<<< HEAD:WebCore/Android.derived.jscbindings.mk
     $(intermediates)/html/canvas/JSCanvasRenderingContext2D.h \
     $(intermediates)/html/canvas/JSCanvasRenderingContext3D.h \
     $(intermediates)/html/canvas/JSCanvasShader.h \
@@ -284,9 +267,6 @@ GEN := \
     $(intermediates)/html/canvas/JSCanvasUnsignedByteArray.h \
     $(intermediates)/html/canvas/JSCanvasUnsignedIntArray.h \
     $(intermediates)/html/canvas/JSCanvasUnsignedShortArray.h
-=======
-    $(intermediates)/html/canvas/JSCanvasRenderingContext2D.h
->>>>>>> webkit.org at r51976:WebCore/Android.derived.jscbindings.mk
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $<
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 8b2ca0c..e0b5d98 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -30,11 +30,7 @@ js_binding_scripts := \
 	$(LOCAL_PATH)/bindings/scripts/IDLStructure.pm \
 	$(LOCAL_PATH)/bindings/scripts/generate-bindings.pl
 
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
 FEATURE_DEFINES := ENABLE_ORIENTATION_EVENTS=1 ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1
-=======
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 V8_BINDING ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
 
 # CSS
 GEN := \
@@ -118,12 +114,9 @@ GEN := \
     $(intermediates)/bindings/V8RangeException.h \
     $(intermediates)/bindings/V8Text.h \
     $(intermediates)/bindings/V8TextEvent.h \
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8Touch.h \
     $(intermediates)/bindings/V8TouchEvent.h \
     $(intermediates)/bindings/V8TouchList.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8TreeWalker.h \
     $(intermediates)/bindings/V8UIEvent.h \
     $(intermediates)/bindings/V8WebKitAnimationEvent.h \
@@ -235,7 +228,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 
 # Canvas
 GEN := \
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasActiveInfo.h \
     $(intermediates)/bindings/V8CanvasArray.h \
     $(intermediates)/bindings/V8CanvasArrayBuffer.h \
@@ -243,23 +235,14 @@ GEN := \
     $(intermediates)/bindings/V8CanvasByteArray.h \
     $(intermediates)/bindings/V8CanvasFloatArray.h \
     $(intermediates)/bindings/V8CanvasFramebuffer.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasGradient.h \
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasIntArray.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasNumberArray.h \
     $(intermediates)/bindings/V8CanvasPattern.h \
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasPixelArray.h \
     $(intermediates)/bindings/V8CanvasProgram.h \
     $(intermediates)/bindings/V8CanvasRenderbuffer.h \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasRenderingContext.h \
-<<<<<<< HEAD:WebCore/Android.derived.v8bindings.mk
     $(intermediates)/bindings/V8CanvasRenderingContext2D.h \
     $(intermediates)/bindings/V8CanvasRenderingContext3D.h \
     $(intermediates)/bindings/V8CanvasShader.h \
@@ -268,9 +251,6 @@ GEN := \
     $(intermediates)/bindings/V8CanvasUnsignedByteArray.h \
     $(intermediates)/bindings/V8CanvasUnsignedIntArray.h \
     $(intermediates)/bindings/V8CanvasUnsignedShortArray.h
-=======
-    $(intermediates)/bindings/V8CanvasRenderingContext2D.h
->>>>>>> webkit.org at r51976:WebCore/Android.derived.v8bindings.mk
 
 $(GEN): PRIVATE_PATH := $(LOCAL_PATH)
 $(GEN): PRIVATE_CUSTOM_TOOL = SOURCE_ROOT=$(PRIVATE_PATH) perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator V8 --include dom --include html --include html/canvas --outputdir $(dir $@) $<
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index 981894c..0eaff05 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -66,7 +66,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSCSSStyleDeclarationCustom.cpp \
 	bindings/js/JSCSSValueCustom.cpp \
 	bindings/js/JSCallbackData.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	bindings/js/JSCanvasArrayBufferConstructor.cpp \
 	bindings/js/JSCanvasArrayCustom.cpp \
 	bindings/js/JSCanvasByteArrayConstructor.cpp \
@@ -75,16 +74,10 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSCanvasFloatArrayCustom.cpp \
 	bindings/js/JSCanvasIntArrayConstructor.cpp \
 	bindings/js/JSCanvasIntArrayCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.jscbindings.mk
 	bindings/js/JSCanvasNumberArrayCustom.cpp \
 	bindings/js/JSCanvasRenderingContext2DCustom.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	bindings/js/JSCanvasRenderingContext3DCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.jscbindings.mk
 	bindings/js/JSCanvasRenderingContextCustom.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	bindings/js/JSCanvasShortArrayConstructor.cpp \
 	bindings/js/JSCanvasShortArrayCustom.cpp \
 	bindings/js/JSCanvasUnsignedByteArrayConstructor.cpp \
@@ -93,8 +86,6 @@ LOCAL_SRC_FILES += \
 	bindings/js/JSCanvasUnsignedIntArrayCustom.cpp \
 	bindings/js/JSCanvasUnsignedShortArrayConstructor.cpp \
 	bindings/js/JSCanvasUnsignedShortArrayCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.jscbindings.mk
 	bindings/js/JSClipboardCustom.cpp \
 	bindings/js/JSConsoleCustom.cpp \
 	bindings/js/JSCoordinatesCustom.cpp \
@@ -195,10 +186,7 @@ LOCAL_SRC_FILES += \
 	bindings/js/ScriptCallFrame.cpp \
 	bindings/js/ScriptCallStack.cpp \
 	bindings/js/ScriptController.cpp \
-<<<<<<< HEAD:WebCore/Android.jscbindings.mk
 	bindings/js/ScriptControllerAndroid.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.jscbindings.mk
 	bindings/js/ScriptEventListener.cpp \
 	bindings/js/ScriptFunctionCall.cpp \
 	bindings/js/ScriptObject.cpp \
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 5b2de3d..71522f5 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -104,10 +104,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	dom/CharacterData.cpp \
 	dom/CheckedRadioButtons.cpp \
 	dom/ChildNodeList.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
-	dom/ClassNames.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	dom/ClassNodeList.cpp \
 	dom/ClientRect.cpp \
 	dom/ClientRectList.cpp \
@@ -163,22 +159,16 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	dom/ScriptExecutionContext.cpp \
 	dom/SelectElement.cpp \
 	dom/SelectorNodeList.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
-=======
 	dom/SpaceSplitString.cpp \
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	dom/StaticNodeList.cpp \
 	dom/StyleElement.cpp \
 	dom/StyledElement.cpp \
 	dom/TagNodeList.cpp \
 	dom/Text.cpp \
 	dom/TextEvent.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	dom/Touch.cpp \
 	dom/TouchEvent.cpp \
 	dom/TouchList.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	dom/Traversal.cpp \
 	dom/TreeWalker.cpp \
 	dom/UIEvent.cpp \
@@ -270,45 +260,30 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
 	\
-<<<<<<< HEAD:WebCore/Android.mk
 	html/canvas/CanvasArray.cpp \
 	html/canvas/CanvasArrayBuffer.cpp \
 	html/canvas/CanvasBuffer.cpp \
 	html/canvas/CanvasByteArray.cpp \
 	html/canvas/CanvasFloatArray.cpp \
 	html/canvas/CanvasFramebuffer.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	html/canvas/CanvasGradient.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	html/canvas/CanvasIntArray.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	html/canvas/CanvasNumberArray.cpp \
 	html/canvas/CanvasObject.cpp \
 	html/canvas/CanvasPattern.cpp \
 	html/canvas/CanvasPixelArray.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	html/canvas/CanvasProgram.cpp \
 	html/canvas/CanvasRenderbuffer.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	html/canvas/CanvasRenderingContext.cpp \
 	html/canvas/CanvasRenderingContext2D.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	html/canvas/CanvasRenderingContext3D.cpp \
 	html/canvas/CanvasShader.cpp \
 	html/canvas/CanvasShortArray.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	html/canvas/CanvasStyle.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	html/canvas/CanvasTexture.cpp \
 	html/canvas/CanvasUnsignedByteArray.cpp \
 	html/canvas/CanvasUnsignedIntArray.cpp \
 	html/canvas/CanvasUnsignedShortArray.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	\
 	loader/Cache.cpp \
 	loader/CachedCSSStyleSheet.cpp \
@@ -485,7 +460,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/graphics/SegmentedFontData.cpp \
 	platform/graphics/SimpleFontData.cpp \
 	platform/graphics/StringTruncator.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	platform/graphics/WidthIterator.cpp \
 	\
 	platform/graphics/android/BitmapAllocatorAndroid.cpp \
@@ -505,9 +479,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/graphics/android/PlatformGraphicsContext.cpp \
 	platform/graphics/android/SharedBufferStream.cpp \
 	platform/graphics/android/android_graphics.cpp \
-=======
-	platform/graphics/WidthIterator.cpp
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 
 ifeq ($(ENABLE_SVG), true)
 LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
@@ -555,15 +526,11 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/network/ResourceHandle.cpp \
 	platform/network/ResourceRequestBase.cpp \
 	platform/network/ResourceResponseBase.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	\
 	platform/network/android/Cookie.cpp \
 	platform/network/android/NetworkStateNotifierAndroid.cpp \
 	platform/network/android/ResourceHandleAndroid.cpp \
 	platform/network/android/ResourceRequestAndroid.cpp \
-=======
-	platform/network/SocketStreamHandleBase.cpp \
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	\
 	platform/posix/FileSystemPOSIX.cpp \
 	\
@@ -583,10 +550,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	platform/text/String.cpp \
 	platform/text/StringBuilder.cpp \
 	platform/text/StringImpl.cpp \
-<<<<<<< HEAD:WebCore/Android.mk
 	platform/text/TextBoundariesICU.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	platform/text/TextBreakIteratorICU.cpp \
 	platform/text/TextCodec.cpp \
 	platform/text/TextCodecICU.cpp \
@@ -614,13 +578,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	plugins/PluginView.cpp \
 	plugins/npapi.cpp \
 	\
-<<<<<<< HEAD:WebCore/Android.mk
 	plugins/android/PluginDataAndroid.cpp \
 	plugins/android/PluginPackageAndroid.cpp \
 	plugins/android/PluginViewAndroid.cpp \
 	\
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.mk
 	rendering/AutoTableLayout.cpp \
 	rendering/CounterNode.cpp \
 	rendering/EllipsisBox.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index 7d028ea..f683fca 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -88,23 +88,17 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8AbstractWorkerCustom.cpp \
 	bindings/v8/custom/V8AttrCustom.cpp \
 	bindings/v8/custom/V8CSSStyleDeclarationCustom.cpp \
-<<<<<<< HEAD:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8CanvasArrayBufferCustom.cpp \
 	bindings/v8/custom/V8CanvasByteArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasFloatArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasIntArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasPixelArrayCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp \
-<<<<<<< HEAD:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8CanvasRenderingContext3DCustom.cpp \
 	bindings/v8/custom/V8CanvasShortArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasUnsignedByteArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasUnsignedIntArrayCustom.cpp \
 	bindings/v8/custom/V8CanvasUnsignedShortArrayCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8ClientRectListCustom.cpp \
 	bindings/v8/custom/V8ClipboardCustom.cpp \
 	bindings/v8/custom/V8CoordinatesCustom.cpp \
@@ -172,10 +166,7 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8SharedWorkerCustom.cpp \
 	bindings/v8/custom/V8StorageCustom.cpp \
 	bindings/v8/custom/V8StyleSheetListCustom.cpp \
-<<<<<<< HEAD:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8TouchListCustom.cpp \
-=======
->>>>>>> webkit.org at r51976:WebCore/Android.v8bindings.mk
 	bindings/v8/custom/V8TreeWalkerCustom.cpp \
 	bindings/v8/custom/V8WebKitCSSMatrixConstructor.cpp \
 	bindings/v8/custom/V8WebKitPointConstructor.cpp \
@@ -187,9 +178,5 @@ LOCAL_SRC_FILES += \
 	bindings/v8/custom/V8XMLSerializerConstructor.cpp
 
 LOCAL_SRC_FILES += \
-<<<<<<< HEAD:WebCore/Android.v8bindings.mk
 	bridge/jni/jni_utility.cpp \
 	bridge/jni/v8/jni_utility_private.cpp
-=======
-	bridge/jni/jni_utility.cpp
->>>>>>> webkit.org at r51976:WebCore/Android.v8bindings.mk