diff options
author | Steve Block <steveblock@google.com> | 2011-05-09 19:57:19 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-13 11:09:52 +0100 |
commit | 0fa866435a202d26c06a48475da734e9e98c2879 (patch) | |
tree | b382226e1e0ff3aeee5089130184ce9f13f25cb0 | |
parent | 31dbc523d9ee6fd7d7e46c540b5f675eeb559ed7 (diff) | |
download | external_webkit-0fa866435a202d26c06a48475da734e9e98c2879.zip external_webkit-0fa866435a202d26c06a48475da734e9e98c2879.tar.gz external_webkit-0fa866435a202d26c06a48475da734e9e98c2879.tar.bz2 |
Merge WebKit at r75315: Fix Makefiles
See http://trac.webkit.org/changeset/74646
Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
-rw-r--r-- | Android.mk | 95 | ||||
-rw-r--r-- | Source/JavaScriptCore/Android.mk | 8 | ||||
-rw-r--r-- | Source/WebCore/Android.derived.jscbindings.mk | 2 | ||||
-rw-r--r-- | Source/WebCore/Android.derived.mk | 4 | ||||
-rw-r--r-- | Source/WebCore/Android.jscbindings.mk | 16 | ||||
-rw-r--r-- | Source/WebCore/Android.mk | 1 | ||||
-rw-r--r-- | Source/WebCore/Android.v8bindings.mk | 7 |
7 files changed, 17 insertions, 116 deletions
@@ -127,10 +127,11 @@ WEBKIT_SRC_FILES := # We have to use bison 2.3 include $(BASE_PATH)/bison_check.mk -WEBCORE_PATH := $(BASE_PATH)/WebCore +SOURCE_PATH := $(BASE_PATH)/Source +WEBCORE_PATH := $(SOURCE_PATH)/WebCore +JAVASCRIPTCORE_PATH := $(SOURCE_PATH)/JavaScriptCore WEBKIT_PATH := $(BASE_PATH)/WebKit -JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore -WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/WebCore +WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/Source/WebCore # Build our list of include paths. We include WebKit/android/icu first so that # any files that include <unicode/ucnv.h> will include our ucnv.h first. We @@ -160,8 +161,11 @@ LOCAL_C_INCLUDES := \ frameworks/base/core/jni/android/graphics \ frameworks/base/include +# Add Source/ for the include of <JavaScriptCore/config.h> from WebCore/config.h +LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ + $(SOURCE_PATH) + LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD $(WEBCORE_PATH) \ $(WEBCORE_PATH)/accessibility \ $(WEBCORE_PATH)/bindings/ \ @@ -224,47 +228,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_PATH)/websockets \ $(WEBCORE_PATH)/workers \ $(WEBCORE_PATH)/xml -======= - $(LOCAL_PATH)/Source/WebCore \ - $(LOCAL_PATH)/Source/WebCore/accessibility \ - $(LOCAL_PATH)/Source/WebCore/bindings/generic \ - $(LOCAL_PATH)/Source/WebCore/css \ - $(LOCAL_PATH)/Source/WebCore/dom \ - $(LOCAL_PATH)/Source/WebCore/editing \ - $(LOCAL_PATH)/Source/WebCore/history \ - $(LOCAL_PATH)/Source/WebCore/history/android \ - $(LOCAL_PATH)/Source/WebCore/html \ - $(LOCAL_PATH)/Source/WebCore/html/canvas \ - $(LOCAL_PATH)/Source/WebCore/inspector \ - $(LOCAL_PATH)/Source/WebCore/loader \ - $(LOCAL_PATH)/Source/WebCore/loader/appcache \ - $(LOCAL_PATH)/Source/WebCore/loader/icon \ - $(LOCAL_PATH)/Source/WebCore/notifications \ - $(LOCAL_PATH)/Source/WebCore/page \ - $(LOCAL_PATH)/Source/WebCore/page/android \ - $(LOCAL_PATH)/Source/WebCore/page/animation \ - $(LOCAL_PATH)/Source/WebCore/platform \ - $(LOCAL_PATH)/Source/WebCore/platform/android \ - $(LOCAL_PATH)/Source/WebCore/platform/animation \ - $(LOCAL_PATH)/Source/WebCore/platform/graphics \ - $(LOCAL_PATH)/Source/WebCore/platform/graphics/android \ - $(LOCAL_PATH)/Source/WebCore/platform/graphics/network \ - $(LOCAL_PATH)/Source/WebCore/platform/graphics/skia \ - $(LOCAL_PATH)/Source/WebCore/platform/graphics/transforms \ - $(LOCAL_PATH)/Source/WebCore/platform/image-decoders \ - $(LOCAL_PATH)/Source/WebCore/platform/mock \ - $(LOCAL_PATH)/Source/WebCore/platform/network \ - $(LOCAL_PATH)/Source/WebCore/platform/network/android \ - $(LOCAL_PATH)/Source/WebCore/platform/sql \ - $(LOCAL_PATH)/Source/WebCore/platform/text \ - $(LOCAL_PATH)/Source/WebCore/plugins \ - $(LOCAL_PATH)/Source/WebCore/plugins/android \ - $(LOCAL_PATH)/Source/WebCore/rendering \ - $(LOCAL_PATH)/Source/WebCore/rendering/style \ - $(LOCAL_PATH)/Source/WebCore/storage \ - $(LOCAL_PATH)/Source/WebCore/workers \ - $(LOCAL_PATH)/Source/WebCore/xml ->>>>>>> webkit.org at r75315 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBKIT_PATH)/android \ @@ -274,7 +237,6 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBKIT_PATH)/android/plugins LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD $(JAVASCRIPTCORE_PATH) \ $(JAVASCRIPTCORE_PATH)/wtf \ $(JAVASCRIPTCORE_PATH)/wtf/unicode \ @@ -285,23 +247,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_INTERMEDIATES_PATH)/css \ $(WEBCORE_INTERMEDIATES_PATH)/html \ $(WEBCORE_INTERMEDIATES_PATH)/platform -======= - $(LOCAL_PATH)/Source/JavaScriptCore \ - $(LOCAL_PATH)/Source/JavaScriptCore/wtf \ - $(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode \ - $(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode/icu - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(base_intermediates)/Source/WebCore/ \ - $(base_intermediates)/Source/WebCore/css \ - $(base_intermediates)/Source/WebCore/html \ - $(base_intermediates)/Source/WebCore/platform ->>>>>>> webkit.org at r75315 # The following includes are needed by the AutoFill feature, or the chrome http # stack LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD $(WEBKIT_PATH)/chromium \ $(WEBKIT_PATH)/chromium/public \ external/chromium/chrome/browser \ @@ -312,35 +261,16 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ ifeq ($(JAVASCRIPT_ENGINE),v8) # Include WTF source file. -d := JavaScriptCore -LOCAL_PATH := $(JAVASCRIPTCORE_PATH) -======= - $(LOCAL_PATH)/Source/WebCore/platform/graphics/filters \ - $(LOCAL_PATH)/Source/WebCore/svg \ - $(LOCAL_PATH)/Source/WebCore/svg/animation \ - $(LOCAL_PATH)/Source/WebCore/svg/graphics \ - $(LOCAL_PATH)/Source/WebCore/svg/graphics/filters \ - $(base_intermediates)/Source/WebCore/svg -endif - -ifeq ($(JAVASCRIPT_ENGINE),v8) -# Include WTF source file. d := Source/JavaScriptCore LOCAL_PATH := $(BASE_PATH)/$d ->>>>>>> webkit.org at r75315 intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.v8.wtf.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) endif # JAVASCRIPT_ENGINE == v8 # Include source files for WebCore -d := WebCore -<<<<<<< HEAD -LOCAL_PATH := $(WEBCORE_PATH) -======= +d := Source/WebCore LOCAL_PATH := $(BASE_PATH)/$d -JAVASCRIPTCORE_PATH := $(BASE_PATH)/Source/JavaScriptCore ->>>>>>> webkit.org at r75315 intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk ifeq ($(JAVASCRIPT_ENGINE),jsc) @@ -364,7 +294,7 @@ endif # Include source files for android WebKit port d := WebKit -LOCAL_PATH := $(WEBKIT_PATH) +LOCAL_PATH := $(BASE_PATH)/$d intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) @@ -507,13 +437,8 @@ LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) LOCAL_CFLAGS := $(WEBKIT_CFLAGS) # Include source files for JavaScriptCore -<<<<<<< HEAD -d := JavaScriptCore -LOCAL_PATH := $(JAVASCRIPTCORE_PATH) -======= d := Source/JavaScriptCore LOCAL_PATH := $(BASE_PATH)/$d ->>>>>>> webkit.org at r75315 LOCAL_MODULE_CLASS := STATIC_LIBRARIES # Cannot use base_intermediates as this is a new module intermediates := $(call local-intermediates-dir) diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index d72b686..579451b 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -200,17 +200,13 @@ LOCAL_SRC_FILES := \ \ wtf/unicode/icu/CollatorICU.cpp \ \ -<<<<<<< HEAD:JavaScriptCore/Android.mk wtf/url/src/URLCharacterTypes.cpp \ wtf/url/src/URLEscape.cpp \ wtf/url/src/URLSegments.cpp \ \ - yarr/RegexCompiler.cpp \ -======= - yarr/RegexPattern.cpp \ ->>>>>>> webkit.org at r75315:Source/JavaScriptCore/Android.mk yarr/RegexInterpreter.cpp \ - yarr/RegexJIT.cpp + yarr/RegexJIT.cpp \ + yarr/RegexPattern.cpp # generated headers JSC_OBJECTS := $(addprefix $(intermediates)/runtime/, \ diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk index 0cc8fa7..e66ef1b 100644 --- a/Source/WebCore/Android.derived.jscbindings.mk +++ b/Source/WebCore/Android.derived.jscbindings.mk @@ -25,7 +25,7 @@ ## # lookup tables for old-style JavaScript bindings -create_hash_table := $(LOCAL_PATH)/Source/JavaScriptCore/create_hash_table +create_hash_table := $(LOCAL_PATH)/../JavaScriptCore/create_hash_table GEN := $(addprefix $(intermediates)/, \ bindings/js/JSDOMWindowBase.lut.h \ diff --git a/Source/WebCore/Android.derived.mk b/Source/WebCore/Android.derived.mk index 3c8f577..f6967ef 100644 --- a/Source/WebCore/Android.derived.mk +++ b/Source/WebCore/Android.derived.mk @@ -78,7 +78,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) GEN := $(intermediates)/html/HTMLEntityTable.cpp $(GEN): SCRIPT := $(LOCAL_PATH)/html/parser/create-html-entity-table -$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../Tools/Scripts/webkitpy +$(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../../Tools/Scripts/webkitpy $(GEN): PRIVATE_CUSTOM_TOOL = $(dir $@)$(notdir $(SCRIPT)) -o $@ $< $(GEN): $(LOCAL_PATH)/html/parser/HTMLEntityNames.in @echo "Generating HTMLEntityTable.cpp" @@ -193,7 +193,7 @@ ifeq ($(ENABLE_AUTOFILL),true) # WebKit <-> Chromium bindings which include headers from the Chromuim project. THIRD_PARTY = $(intermediates)/third_party -CHROMIUM_SRC_DIR := $(LOCAL_PATH)/../../chromium +CHROMIUM_SRC_DIR := $(LOCAL_PATH)/../../../chromium SCRIPT := $(CHROMIUM_SRC_DIR)/android/generateAndroidForwardingHeader.pl GEN := $(THIRD_PARTY)/expat/files/lib/expat.h diff --git a/Source/WebCore/Android.jscbindings.mk b/Source/WebCore/Android.jscbindings.mk index b14769a..697f5ef 100644 --- a/Source/WebCore/Android.jscbindings.mk +++ b/Source/WebCore/Android.jscbindings.mk @@ -46,7 +46,6 @@ BINDING_C_INCLUDES := \ $(JAVASCRIPTCORE_PATH)/wrec \ $(JAVASCRIPTCORE_PATH)/ForwardingHeaders \ \ -<<<<<<< HEAD:WebCore/Android.jscbindings.mk $(WEBCORE_INTERMEDIATES_PATH)/bindings/js \ $(WEBCORE_INTERMEDIATES_PATH)/dom \ $(WEBCORE_INTERMEDIATES_PATH)/fileapi \ @@ -60,18 +59,6 @@ BINDING_C_INCLUDES := \ $(WEBCORE_INTERMEDIATES_PATH)/webaudio \ $(WEBCORE_INTERMEDIATES_PATH)/workers \ $(WEBCORE_INTERMEDIATES_PATH)/xml -======= - $(base_intermediates)/Source/WebCore/bindings/js \ - $(base_intermediates)/Source/WebCore/dom \ - $(base_intermediates)/Source/WebCore/html/canvas \ - $(base_intermediates)/Source/WebCore/inspector \ - $(base_intermediates)/Source/WebCore/loader/appcache \ - $(base_intermediates)/Source/WebCore/page \ - $(base_intermediates)/Source/WebCore/plugins \ - $(base_intermediates)/Source/WebCore/storage \ - $(base_intermediates)/Source/WebCore/workers \ - $(base_intermediates)/Source/WebCore/xml ->>>>>>> webkit.org at r75315:Source/WebCore/Android.jscbindings.mk LOCAL_SRC_FILES += \ bindings/js/DOMObjectHashTableMap.cpp \ @@ -176,7 +163,6 @@ LOCAL_SRC_FILES += \ bindings/js/JSNodeListCustom.cpp \ bindings/js/JSOptionConstructor.cpp \ bindings/js/JSPluginElementFunctions.cpp \ - bindings/js/JSPopStateEventCustom.cpp \ bindings/js/JSProcessingInstructionCustom.cpp \ bindings/js/JSSQLResultSetRowListCustom.cpp \ bindings/js/JSSQLTransactionCustom.cpp \ @@ -220,8 +206,6 @@ LOCAL_SRC_FILES += \ bindings/js/SerializedScriptValue.cpp \ bindings/js/WorkerScriptController.cpp \ \ - bindings/js/specialization/JSBindingState.cpp \ - \ bindings/ScriptControllerBase.cpp \ \ bridge/IdentifierRep.cpp \ diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index c1bfb0b..a1a56d6 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -799,6 +799,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/RenderFrame.cpp \ rendering/RenderFrameBase.cpp \ rendering/RenderFrameSet.cpp \ + rendering/RenderFullScreen.cpp \ rendering/RenderHTMLCanvas.cpp \ rendering/RenderIFrame.cpp \ rendering/RenderImage.cpp \ diff --git a/Source/WebCore/Android.v8bindings.mk b/Source/WebCore/Android.v8bindings.mk index 3cce546..63b6ae1 100644 --- a/Source/WebCore/Android.v8bindings.mk +++ b/Source/WebCore/Android.v8bindings.mk @@ -36,14 +36,9 @@ BINDING_C_INCLUDES := \ $(LOCAL_PATH)/bridge/jni/v8 \ $(LOCAL_PATH)/bridge/jsc \ \ -<<<<<<< HEAD:WebCore/Android.v8bindings.mk $(WEBCORE_INTERMEDIATES_PATH)/bindings \ $(WEBCORE_INTERMEDIATES_PATH)/svg \ - $(base_intermediates)/JavaScriptCore -======= - $(base_intermediates)/Source/WebCore/bindings \ $(base_intermediates)/Source/JavaScriptCore ->>>>>>> webkit.org at r75315:Source/WebCore/Android.v8bindings.mk LOCAL_SRC_FILES += \ bindings/ScriptControllerBase.cpp \ @@ -79,6 +74,7 @@ LOCAL_SRC_FILES += \ bindings/v8/V8DOMWindowShell.cpp \ bindings/v8/V8DOMWrapper.cpp \ bindings/v8/V8DataGridDataSource.cpp \ + bindings/v8/V8EventListener.cpp \ bindings/v8/V8EventListenerList.cpp \ bindings/v8/V8GCController.cpp \ bindings/v8/V8GCForContextDispose.cpp \ @@ -109,7 +105,6 @@ LOCAL_SRC_FILES += \ bindings/v8/custom/V8ConsoleCustom.cpp \ bindings/v8/custom/V8CoordinatesCustom.cpp \ bindings/v8/custom/V8CustomApplicationInstalledCallback.cpp \ - bindings/v8/custom/V8CustomEventListener.cpp \ bindings/v8/custom/V8CustomPositionCallback.cpp \ bindings/v8/custom/V8CustomPositionErrorCallback.cpp \ bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp \ |