diff options
| -rw-r--r-- | Android.mk | 35 | ||||
| -rw-r--r-- | Source/JavaScriptCore/Android.mk | 8 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 9 | ||||
| -rw-r--r-- | Source/WebCore/Android.mk | 33 |
4 files changed, 13 insertions, 72 deletions
@@ -127,17 +127,13 @@ WEBKIT_SRC_FILES := # We have to use bison 2.3 include $(BASE_PATH)/bison_check.mk -<<<<<<< HEAD SOURCE_PATH := $(BASE_PATH)/Source WEBCORE_PATH := $(SOURCE_PATH)/WebCore JAVASCRIPTCORE_PATH := $(SOURCE_PATH)/JavaScriptCore -WEBKIT_PATH := $(BASE_PATH)/WebKit +WEBKIT_PATH := $(SOURCE_PATH)/WebKit WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/Source/WebCore -# Build our list of include paths. We include WebKit/android/icu first so that -======= # Build our list of include paths. We include Source/WebKit/android/icu first so that ->>>>>>> WebKit.org @ r75993 # any files that include <unicode/ucnv.h> will include our ucnv.h first. We # also add external/ as an include directory so that we can specify the real # icu header directory as a more exact reference to avoid including our ucnv.h. @@ -146,11 +142,7 @@ WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/Source/WebCore # the right config.h. LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ -<<<<<<< HEAD $(WEBKIT_PATH)/android/icu \ -======= - $(LOCAL_PATH)/Source/WebKit/android/icu \ ->>>>>>> WebKit.org @ r75993 external/ \ external/icu4c/common \ external/icu4c/i18n \ @@ -174,7 +166,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(SOURCE_PATH) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD $(WEBCORE_PATH) \ $(WEBCORE_PATH)/accessibility \ $(WEBCORE_PATH)/bindings/ \ @@ -237,14 +228,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_PATH)/websockets \ $(WEBCORE_PATH)/workers \ $(WEBCORE_PATH)/xml -======= - $(LOCAL_PATH)/Source/WebKit/android \ - $(LOCAL_PATH)/Source/WebKit/android/WebCoreSupport \ - $(LOCAL_PATH)/Source/WebKit/android/jni \ - $(LOCAL_PATH)/Source/WebKit/android/nav \ - $(LOCAL_PATH)/Source/WebKit/android/plugins \ - $(LOCAL_PATH)/Source/WebKit/android/stl ->>>>>>> WebKit.org @ r75993 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBKIT_PATH)/android \ @@ -310,7 +293,7 @@ include $(LOCAL_PATH)/Android.derived.v8bindings.mk endif # Include source files for android WebKit port -d := WebKit +d := Source/WebKit LOCAL_PATH := $(BASE_PATH)/$d intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk @@ -490,7 +473,7 @@ LOCAL_CPPFLAGS := $(WEBKIT_CPPFLAGS) LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) LOCAL_PATH := $(BASE_PATH) LOCAL_SRC_FILES := \ - WebKit/android/jni/WebCoreJniOnLoad.cpp + Source/WebKit/android/jni/WebCoreJniOnLoad.cpp ifeq ($(ENABLE_AUTOFILL),true) # AutoFill requires some cpp files from Chromium to link with @@ -498,10 +481,10 @@ ifeq ($(ENABLE_AUTOFILL),true) # because they have cpp file extensions, not .cc. LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1 LOCAL_SRC_FILES += \ - WebKit/android/WebCoreSupport/autofill/MainThreadProxy.cpp \ - WebKit/chromium/src/WebCString.cpp \ - WebKit/chromium/src/WebRegularExpression.cpp \ - WebKit/chromium/src/WebString.cpp + Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.cpp \ + Source/WebKit/chromium/src/WebCString.cpp \ + Source/WebKit/chromium/src/WebRegularExpression.cpp \ + Source/WebKit/chromium/src/WebString.cpp endif # Do this dependency by hand. The reason we have to do this is because the @@ -512,10 +495,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(filter %.h, $(WEBKIT_GENERATED_SOURCES)) include $(BUILD_SHARED_LIBRARY) # Build the wds client -include $(BASE_PATH)/WebKit/android/wds/client/Android.mk +include $(WEBKIT_PATH)/android/wds/client/Android.mk # Build the performance command line tool. -include $(BASE_PATH)/WebKit/android/benchmark/Android.mk +include $(WEBKIT_PATH)/android/benchmark/Android.mk # Build the webkit merge tool. include $(BASE_PATH)/Tools/android/webkitmerge/Android.mk diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index ba6437b..9f5c1ce 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -202,20 +202,14 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ -<<<<<<< HEAD wtf/url/src/URLCharacterTypes.cpp \ wtf/url/src/URLEscape.cpp \ wtf/url/src/URLSegments.cpp \ \ - yarr/RegexInterpreter.cpp \ - yarr/RegexJIT.cpp \ - yarr/RegexPattern.cpp -======= yarr/YarrPattern.cpp \ yarr/YarrInterpreter.cpp \ yarr/YarrJIT.cpp \ - yarr/YarrSyntaxChecker.cpp ->>>>>>> WebKit.org @ r75993 + yarr/YarrSyntaxChecker.cpp # generated headers JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \ diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index eb00a64..d708f63 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -149,7 +149,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) GEN := \ $(intermediates)/bindings/V8Blob.h \ $(intermediates)/bindings/V8BlobBuilder.h \ -<<<<<<< HEAD $(intermediates)/bindings/V8DOMFileSystem.h \ $(intermediates)/bindings/V8DOMFileSystemSync.h \ $(intermediates)/bindings/V8DirectoryEntry.h \ @@ -163,13 +162,6 @@ GEN := \ $(intermediates)/bindings/V8EntryCallback.h \ $(intermediates)/bindings/V8EntrySync.h \ $(intermediates)/bindings/V8ErrorCallback.h \ -======= - $(intermediates)/bindings/V8DOMTokenList.h \ - $(intermediates)/bindings/V8DOMSettableTokenList.h \ - $(intermediates)/bindings/V8DOMURL.h \ - $(intermediates)/bindings/V8DataGridColumn.h \ - $(intermediates)/bindings/V8DataGridColumnList.h \ ->>>>>>> WebKit.org @ r75993 $(intermediates)/bindings/V8File.h \ $(intermediates)/bindings/V8FileCallback.h \ $(intermediates)/bindings/V8FileEntry.h \ @@ -201,6 +193,7 @@ GEN := \ $(intermediates)/bindings/V8DOMFormData.h \ $(intermediates)/bindings/V8DOMSettableTokenList.h \ $(intermediates)/bindings/V8DOMTokenList.h \ + $(intermediates)/bindings/V8DOMURL.h \ $(intermediates)/bindings/V8DataGridColumn.h \ $(intermediates)/bindings/V8DataGridColumnList.h \ $(intermediates)/bindings/V8HTMLAllCollection.h \ diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index 7ae9c44..a0e56de 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -303,11 +303,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ html/DOMFormData.cpp \ html/DOMSettableTokenList.cpp \ html/DOMTokenList.cpp \ -<<<<<<< HEAD - html/DateComponents.cpp \ -======= html/DOMURL.cpp \ ->>>>>>> WebKit.org @ r75993 + html/DateComponents.cpp \ html/DateInputType.cpp \ html/DateTimeInputType.cpp \ html/DateTimeLocalInputType.cpp \ @@ -830,38 +827,12 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ -<<<<<<< HEAD - rendering/RenderSVGBlock.cpp \ - rendering/RenderSVGContainer.cpp \ - rendering/RenderSVGGradientStop.cpp \ - rendering/RenderSVGHiddenContainer.cpp \ - rendering/RenderSVGImage.cpp \ - rendering/RenderSVGModelObject.cpp \ - rendering/RenderSVGResource.cpp \ - rendering/RenderSVGResourceClipper.cpp \ - rendering/RenderSVGResourceContainer.cpp \ - rendering/RenderSVGResourceFilter.cpp \ - rendering/RenderSVGResourceFilterPrimitive.cpp \ - rendering/RenderSVGResourceGradient.cpp \ - rendering/RenderSVGResourceLinearGradient.cpp \ - rendering/RenderSVGResourceMarker.cpp \ - rendering/RenderSVGResourceMasker.cpp \ - rendering/RenderSVGResourcePattern.cpp \ - rendering/RenderSVGResourceRadialGradient.cpp \ - rendering/RenderSVGResourceSolidColor.cpp \ - rendering/RenderSVGRoot.cpp \ - rendering/RenderSVGShadowTreeRootContainer.cpp \ - rendering/RenderSVGTransformableContainer.cpp \ - rendering/RenderSVGViewportContainer.cpp \ - \ -======= rendering/svg/RenderSVGBlock.cpp \ rendering/svg/RenderSVGContainer.cpp \ rendering/svg/RenderSVGForeignObject.cpp \ rendering/svg/RenderSVGGradientStop.cpp \ rendering/svg/RenderSVGHiddenContainer.cpp \ rendering/svg/RenderSVGImage.cpp \ ->>>>>>> WebKit.org @ r75993 rendering/svg/RenderSVGInline.cpp \ rendering/svg/RenderSVGInlineText.cpp \ rendering/svg/RenderSVGModelObject.cpp \ @@ -895,7 +866,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/svg/SVGResourcesCache.cpp \ rendering/svg/SVGResourcesCycleSolver.cpp \ rendering/svg/SVGRootInlineBox.cpp \ - rendering/svg/SVGShadowTreeElements.cpp + rendering/svg/SVGShadowTreeElements.cpp \ rendering/svg/SVGTextChunk.cpp \ rendering/svg/SVGTextChunkBuilder.cpp \ rendering/svg/SVGTextLayoutAttributes.cpp \ |