diff options
| -rw-r--r-- | Android.mk (renamed from Source/Android.mk) | 88 | ||||
| -rw-r--r-- | Source/JavaScriptCore/Android.mk | 17 | ||||
| -rw-r--r-- | Source/JavaScriptCore/Android.v8.wtf.mk | 28 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.jscbindings.mk | 1 | ||||
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 1 | ||||
| -rw-r--r-- | Source/WebCore/Android.mk | 6 |
6 files changed, 17 insertions, 124 deletions
diff --git a/Source/Android.mk b/Android.mk index 7bdc13e..acc102c 100644 --- a/Source/Android.mk +++ b/Android.mk @@ -127,7 +127,6 @@ WEBKIT_SRC_FILES := # We have to use bison 2.3 include $(BASE_PATH)/bison_check.mk -<<<<<<< HEAD:Android.mk SOURCE_PATH := $(BASE_PATH)/Source WEBCORE_PATH := $(SOURCE_PATH)/WebCore JAVASCRIPTCORE_PATH := $(SOURCE_PATH)/JavaScriptCore @@ -135,9 +134,6 @@ WEBKIT_PATH := $(SOURCE_PATH)/WebKit WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/Source/WebCore # Build our list of include paths. We include Source/WebKit/android/icu first so that -======= -# Build our list of include paths. We include WebKit/android/icu first so that ->>>>>>> webkit.org at r78450:Source/Android.mk # 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:Android.mk $(WEBKIT_PATH)/android/icu \ -======= - $(LOCAL_PATH)/WebKit/android/icu \ ->>>>>>> webkit.org at r78450:Source/Android.mk external/ \ external/icu4c/common \ external/icu4c/i18n \ @@ -171,7 +163,6 @@ LOCAL_C_INCLUDES := \ # Add Source/ for the include of <JavaScriptCore/config.h> from WebCore/config.h LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD:Android.mk $(SOURCE_PATH) LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ @@ -250,70 +241,8 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(JAVASCRIPTCORE_PATH)/wtf \ $(JAVASCRIPTCORE_PATH)/wtf/unicode \ $(JAVASCRIPTCORE_PATH)/wtf/unicode/icu -======= - $(LOCAL_PATH)/WebCore \ - $(LOCAL_PATH)/WebCore/accessibility \ - $(LOCAL_PATH)/WebCore/bindings/generic \ - $(LOCAL_PATH)/WebCore/css \ - $(LOCAL_PATH)/WebCore/dom \ - $(LOCAL_PATH)/WebCore/editing \ - $(LOCAL_PATH)/WebCore/history \ - $(LOCAL_PATH)/WebCore/history/android \ - $(LOCAL_PATH)/WebCore/html \ - $(LOCAL_PATH)/WebCore/html/canvas \ - $(LOCAL_PATH)/WebCore/inspector \ - $(LOCAL_PATH)/WebCore/loader \ - $(LOCAL_PATH)/WebCore/loader/appcache \ - $(LOCAL_PATH)/WebCore/loader/icon \ - $(LOCAL_PATH)/WebCore/notifications \ - $(LOCAL_PATH)/WebCore/page \ - $(LOCAL_PATH)/WebCore/page/android \ - $(LOCAL_PATH)/WebCore/page/animation \ - $(LOCAL_PATH)/WebCore/platform \ - $(LOCAL_PATH)/WebCore/platform/android \ - $(LOCAL_PATH)/WebCore/platform/animation \ - $(LOCAL_PATH)/WebCore/platform/graphics \ - $(LOCAL_PATH)/WebCore/platform/graphics/android \ - $(LOCAL_PATH)/WebCore/platform/graphics/network \ - $(LOCAL_PATH)/WebCore/platform/graphics/skia \ - $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ - $(LOCAL_PATH)/WebCore/platform/image-decoders \ - $(LOCAL_PATH)/WebCore/platform/mock \ - $(LOCAL_PATH)/WebCore/platform/network \ - $(LOCAL_PATH)/WebCore/platform/network/android \ - $(LOCAL_PATH)/WebCore/platform/sql \ - $(LOCAL_PATH)/WebCore/platform/text \ - $(LOCAL_PATH)/WebCore/plugins \ - $(LOCAL_PATH)/WebCore/plugins/android \ - $(LOCAL_PATH)/WebCore/rendering \ - $(LOCAL_PATH)/WebCore/rendering/style \ - $(LOCAL_PATH)/WebCore/storage \ - $(LOCAL_PATH)/WebCore/workers \ - $(LOCAL_PATH)/WebCore/xml LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(LOCAL_PATH)/WebKit/android \ - $(LOCAL_PATH)/WebKit/android/WebCoreSupport \ - $(LOCAL_PATH)/WebKit/android/jni \ - $(LOCAL_PATH)/WebKit/android/nav \ - $(LOCAL_PATH)/WebKit/android/plugins \ - $(LOCAL_PATH)/WebKit/android/stl - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(LOCAL_PATH)/JavaScriptCore \ - $(LOCAL_PATH)/JavaScriptCore/wtf \ - $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ - $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(base_intermediates)/WebCore/ \ - $(base_intermediates)/WebCore/css \ - $(base_intermediates)/WebCore/html \ - $(base_intermediates)/WebCore/platform ->>>>>>> webkit.org at r78450:Source/Android.mk - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ -<<<<<<< HEAD:Android.mk $(WEBCORE_INTERMEDIATES_PATH) \ $(WEBCORE_INTERMEDIATES_PATH)/css \ $(WEBCORE_INTERMEDIATES_PATH)/html \ @@ -329,19 +258,10 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ external/chromium \ external/chromium/chrome \ external/skia -======= - $(LOCAL_PATH)/WebCore/platform/graphics/filters \ - $(LOCAL_PATH)/WebCore/svg \ - $(LOCAL_PATH)/WebCore/svg/animation \ - $(LOCAL_PATH)/WebCore/svg/graphics \ - $(LOCAL_PATH)/WebCore/svg/graphics/filters \ - $(base_intermediates)/WebCore/svg -endif ->>>>>>> webkit.org at r78450:Source/Android.mk ifeq ($(JAVASCRIPT_ENGINE),v8) # Include WTF source file. -d := JavaScriptCore +d := Source/JavaScriptCore LOCAL_PATH := $(BASE_PATH)/$d intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.v8.wtf.mk @@ -351,10 +271,6 @@ endif # JAVASCRIPT_ENGINE == v8 # Include source files for WebCore d := Source/WebCore LOCAL_PATH := $(BASE_PATH)/$d -<<<<<<< HEAD:Android.mk -======= -JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore ->>>>>>> webkit.org at r78450:Source/Android.mk intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk ifeq ($(JAVASCRIPT_ENGINE),jsc) @@ -521,7 +437,7 @@ LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) LOCAL_CFLAGS := $(WEBKIT_CFLAGS) # Include source files for JavaScriptCore -d := JavaScriptCore +d := Source/JavaScriptCore LOCAL_PATH := $(BASE_PATH)/$d LOCAL_MODULE_CLASS := STATIC_LIBRARIES # Cannot use base_intermediates as this is a new module diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk index 269d298..31d6fde 100644 --- a/Source/JavaScriptCore/Android.mk +++ b/Source/JavaScriptCore/Android.mk @@ -64,6 +64,7 @@ LOCAL_SRC_FILES := \ parser/Nodes.cpp \ parser/Parser.cpp \ parser/ParserArena.cpp \ + parser/SourceProviderCache.cpp \ \ profiler/Profile.cpp \ profiler/ProfileGenerator.cpp \ @@ -172,11 +173,8 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ -<<<<<<< HEAD wtf/OSAllocatorPosix.cpp \ -======= wtf/OSRandomSource.cpp \ ->>>>>>> webkit.org at r78450 wtf/PageAllocationAligned.cpp\ wtf/PageBlock.cpp\ wtf/RandomNumber.cpp \ @@ -238,21 +236,10 @@ $(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table $(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table $(transform-generated-source) -<<<<<<< HEAD -CHARTABLES := $(intermediates)/chartables.c -$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) -$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@ -$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables -$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h - $(transform-generated-source) - REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h $(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH) $(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@ $(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) $(REGEXP_JIT_TABLES) -======= -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) ->>>>>>> webkit.org at r78450 +LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(REGEXP_JIT_TABLES) diff --git a/Source/JavaScriptCore/Android.v8.wtf.mk b/Source/JavaScriptCore/Android.v8.wtf.mk index 11df0fa..603c454 100644 --- a/Source/JavaScriptCore/Android.v8.wtf.mk +++ b/Source/JavaScriptCore/Android.v8.wtf.mk @@ -36,13 +36,10 @@ LOCAL_SRC_FILES := \ wtf/HashTable.cpp \ wtf/MD5.cpp \ wtf/MainThread.cpp \ -<<<<<<< HEAD wtf/OSAllocatorPosix.cpp \ + wtf/OSRandomSource.cpp \ wtf/PageAllocationAligned.cpp \ wtf/PageBlock.cpp \ -======= - wtf/OSRandomSource.cpp \ ->>>>>>> webkit.org at r78450 wtf/RandomNumber.cpp \ wtf/RefCountedLeakCounter.cpp \ wtf/StackBounds.cpp \ @@ -67,24 +64,19 @@ LOCAL_SRC_FILES := \ wtf/unicode/CollatorDefault.cpp \ wtf/unicode/UTF8.cpp \ \ -<<<<<<< HEAD wtf/unicode/icu/CollatorICU.cpp \ \ wtf/url/src/URLCharacterTypes.cpp \ wtf/url/src/URLEscape.cpp \ - wtf/url/src/URLSegments.cpp + wtf/url/src/URLSegments.cpp \ + \ + yarr/YarrInterpreter.cpp \ + yarr/YarrPattern.cpp -CHARTABLES := $(intermediates)/chartables.c -$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) -$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@ -$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables -$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h +REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h +$(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH) +$(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@ +$(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables $(transform-generated-source) -$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) - -# We do not add $(CHARTABLES) to LOCAL_GENERATED_SOURCES because the chartables.c file -# is explicitly #included in pcre_tables.cpp. -======= - wtf/unicode/icu/CollatorICU.cpp ->>>>>>> webkit.org at r78450 +LOCAL_GENERATED_SOURCES += $(REGEXP_JIT_TABLES) diff --git a/Source/WebCore/Android.derived.jscbindings.mk b/Source/WebCore/Android.derived.jscbindings.mk index 002440a..dccbf05 100644 --- a/Source/WebCore/Android.derived.jscbindings.mk +++ b/Source/WebCore/Android.derived.jscbindings.mk @@ -361,6 +361,7 @@ GEN := \ $(intermediates)/page/JSConnection.h \ $(intermediates)/page/JSConsole.h \ $(intermediates)/page/JSCoordinates.h \ + $(intermediates)/page/JSCrypto.h \ $(intermediates)/page/JSDOMSelection.h \ $(intermediates)/page/JSDOMWindow.h \ $(intermediates)/page/JSEventSource.h \ diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index 70b6377..93f8548 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -347,6 +347,7 @@ GEN := \ $(intermediates)/bindings/V8Connection.h \ $(intermediates)/bindings/V8Console.h \ $(intermediates)/bindings/V8Coordinates.h \ + $(intermediates)/bindings/V8Crypto.h \ $(intermediates)/bindings/V8DOMSelection.h \ $(intermediates)/bindings/V8DOMWindow.h \ $(intermediates)/bindings/V8EventSource.h \ diff --git a/Source/WebCore/Android.mk b/Source/WebCore/Android.mk index cec49fd..4529f83 100644 --- a/Source/WebCore/Android.mk +++ b/Source/WebCore/Android.mk @@ -740,12 +740,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ \ platform/text/Base64.cpp \ platform/text/BidiContext.cpp \ -<<<<<<< HEAD - platform/text/LineEnding.cpp \ -======= platform/text/Hyphenation.cpp \ + platform/text/LineEnding.cpp \ platform/text/LocalizedNumberNone.cpp \ ->>>>>>> webkit.org at r78450 platform/text/RegularExpression.cpp \ platform/text/SegmentedString.cpp \ platform/text/String.cpp \ @@ -983,7 +980,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/IDBRequest.cpp \ storage/IDBSQLiteDatabase.cpp \ storage/IDBSuccessEvent.cpp \ - storage/IDBTimeoutEvent.cpp \ storage/IDBTransaction.cpp \ storage/LocalStorageTask.cpp \ storage/LocalStorageThread.cpp \ |