diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android.mk | 588 | ||||
| -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, 15 insertions, 626 deletions
diff --git a/Source/Android.mk b/Source/Android.mk deleted file mode 100644 index 7bdc13e..0000000 --- a/Source/Android.mk +++ /dev/null @@ -1,588 +0,0 @@ -## -## Copyright 2009, The Android Open Source Project -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -## - -# Control SVG compiling in webkit. -# Default is true unless explictly disabled. -ifneq ($(ENABLE_SVG),false) - ENABLE_SVG = true -endif - -# Control complex scripts support compiling in webkit. -# Default is true unless explictly disabled. -ifneq ($(SUPPORT_COMPLEX_SCRIPTS),false) - SUPPORT_COMPLEX_SCRIPTS = true -endif - -# Two ways to control which JS engine is used: -# 1. use JS_ENGINE environment variable, value can be either 'jsc' or 'v8' -# This is the preferred way. -# 2. if JS_ENGINE is not set, or is not 'jsc' or 'v8', this makefile picks -# up a default engine to build. -# To help setup buildbot, a new environment variable, USE_ALT_JS_ENGINE, -# can be set to true, so that two builds can be different but without -# specifying which JS engine to use. -# To enable JIT in Android's JSC, please set ENABLE_JSC_JIT environment -# variable to true. - -# To enable JIT in Android's JSC, please set ENABLE_JSC_JIT environment -# variable to true. - -# Read JS_ENGINE environment variable -JAVASCRIPT_ENGINE = $(JS_ENGINE) - -# We default to the V8 JS engine. -DEFAULT_ENGINE = v8 -ALT_ENGINE = jsc - -ifneq ($(JAVASCRIPT_ENGINE),jsc) - ifneq ($(JAVASCRIPT_ENGINE),v8) - # No JS engine is specified, pickup the one we want as default. - ifeq ($(USE_ALT_JS_ENGINE),true) - JAVASCRIPT_ENGINE = $(ALT_ENGINE) - else - JAVASCRIPT_ENGINE = $(DEFAULT_ENGINE) - endif - endif -endif -# We can't use V8 on the simulator -ifeq ($(TARGET_SIMULATOR),true) - JAVASCRIPT_ENGINE = jsc -endif - -# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot -# use the Chrome http stack either. -ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) - JAVASCRIPT_ENGINE := jsc - USE_ALT_HTTP := true -endif - -# See if the user has specified a stack they want to use -HTTP_STACK = $(HTTP) -# We default to the Chrome HTTP stack. -DEFAULT_HTTP = chrome -ALT_HTTP = android - -ifneq ($(HTTP_STACK),chrome) - ifneq ($(HTTP_STACK),android) - # No HTTP stack is specified, pickup the one we want as default. - ifeq ($(USE_ALT_HTTP),true) - HTTP_STACK = $(ALT_HTTP) - else - HTTP_STACK = $(DEFAULT_HTTP) - endif - endif -endif - -# The Chrome stack can not be used with JSC and hence can not be used be used -# with the simulator. -ifeq ($(JAVASCRIPT_ENGINE),jsc) - ifeq ($(HTTP_STACK),chrome) - $(error Can not build with JSC and the Chrome HTTP stack) - endif -endif - -# Read the environment variable to determine if Autofill is compiled. -# The default is on. Chrome HTTP stack must be used when Autofill -# is turned on. -ifneq ($(ENABLE_AUTOFILL),false) - ENABLE_AUTOFILL = true -endif -ifneq ($(HTTP_STACK),chrome) - ENABLE_AUTOFILL = false -endif - -BASE_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Define our module and find the intermediates directory -LOCAL_MODULE := libwebcore -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -base_intermediates := $(call local-intermediates-dir) - -# Using := here prevents recursive expansion -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 -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. -# -# Note that JavasCriptCore/ must be included after WebCore/, so that we pick up -# 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 \ - external/jpeg \ - external/libxml2/include \ - external/libxslt \ - external/hyphenation \ - external/skia/emoji \ - external/skia/include/core \ - external/skia/include/effects \ - external/skia/include/images \ - external/skia/include/ports \ - external/skia/include/utils \ - external/skia/src/ports \ - external/sqlite/dist \ - 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) \ -<<<<<<< HEAD:Android.mk - $(SOURCE_PATH) - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(WEBCORE_PATH) \ - $(WEBCORE_PATH)/accessibility \ - $(WEBCORE_PATH)/bindings/ \ - $(WEBCORE_PATH)/bindings/generic \ - $(WEBCORE_PATH)/css \ - $(WEBCORE_PATH)/dom \ - $(WEBCORE_PATH)/editing \ - $(WEBCORE_PATH)/fileapi \ - $(WEBCORE_PATH)/history \ - $(WEBCORE_PATH)/history/android \ - $(WEBCORE_PATH)/html \ - $(WEBCORE_PATH)/html/canvas \ - $(WEBCORE_PATH)/html/parser \ - $(WEBCORE_PATH)/html/shadow \ - $(WEBCORE_PATH)/inspector \ - $(WEBCORE_PATH)/loader \ - $(WEBCORE_PATH)/loader/appcache \ - $(WEBCORE_PATH)/loader/archive \ - $(WEBCORE_PATH)/loader/archive/android \ - $(WEBCORE_PATH)/loader/cache \ - $(WEBCORE_PATH)/loader/icon \ - $(WEBCORE_PATH)/notifications \ - $(WEBCORE_PATH)/page \ - $(WEBCORE_PATH)/page/android \ - $(WEBCORE_PATH)/page/animation \ - $(WEBCORE_PATH)/platform \ - $(WEBCORE_PATH)/platform/android \ - $(WEBCORE_PATH)/platform/animation \ - $(WEBCORE_PATH)/platform/graphics \ - $(WEBCORE_PATH)/platform/graphics/android \ - $(WEBCORE_PATH)/platform/graphics/filters \ - $(WEBCORE_PATH)/platform/graphics/gpu \ - $(WEBCORE_PATH)/platform/graphics/network \ - $(WEBCORE_PATH)/platform/graphics/skia \ - $(WEBCORE_PATH)/platform/graphics/transforms \ - $(WEBCORE_PATH)/platform/image-decoders \ - $(WEBCORE_PATH)/platform/image-decoders/bmp \ - $(WEBCORE_PATH)/platform/image-decoders/gif \ - $(WEBCORE_PATH)/platform/image-decoders/ico \ - $(WEBCORE_PATH)/platform/image-decoders/jpeg \ - $(WEBCORE_PATH)/platform/image-decoders/png \ - $(WEBCORE_PATH)/platform/image-decoders/webp \ - $(WEBCORE_PATH)/platform/mock \ - $(WEBCORE_PATH)/platform/network \ - $(WEBCORE_PATH)/platform/network/android \ - $(WEBCORE_PATH)/platform/sql \ - $(WEBCORE_PATH)/platform/text \ - $(WEBCORE_PATH)/platform/text/transcoder \ - $(WEBCORE_PATH)/plugins \ - $(WEBCORE_PATH)/plugins/android \ - $(WEBCORE_PATH)/rendering \ - $(WEBCORE_PATH)/rendering/style \ - $(WEBCORE_PATH)/rendering/svg \ - $(WEBCORE_PATH)/storage \ - $(WEBCORE_PATH)/svg \ - $(WEBCORE_PATH)/svg/animation \ - $(WEBCORE_PATH)/svg/graphics \ - $(WEBCORE_PATH)/svg/graphics/filters \ - $(WEBCORE_PATH)/svg/properties \ - $(WEBCORE_PATH)/websockets \ - $(WEBCORE_PATH)/workers \ - $(WEBCORE_PATH)/xml - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(WEBKIT_PATH)/android \ - $(WEBKIT_PATH)/android/WebCoreSupport \ - $(WEBKIT_PATH)/android/jni \ - $(WEBKIT_PATH)/android/nav \ - $(WEBKIT_PATH)/android/plugins - -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(JAVASCRIPTCORE_PATH) \ - $(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 \ - $(WEBCORE_INTERMEDIATES_PATH)/platform - -# The following includes are needed by the AutoFill feature, or the chrome http -# stack -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(WEBKIT_PATH)/chromium \ - $(WEBKIT_PATH)/chromium/public \ - external/chromium/chrome/browser \ - external/chromium/chrome/renderer \ - 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 -LOCAL_PATH := $(BASE_PATH)/$d -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 := 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) -include $(LOCAL_PATH)/Android.jscbindings.mk -endif -ifeq ($(JAVASCRIPT_ENGINE),v8) -include $(LOCAL_PATH)/Android.v8bindings.mk -endif -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -LOCAL_C_INCLUDES += $(BINDING_C_INCLUDES) - -# Include the derived source files for WebCore. Uses the same path as -# WebCore -include $(LOCAL_PATH)/Android.derived.mk -ifeq ($(JAVASCRIPT_ENGINE),jsc) -include $(LOCAL_PATH)/Android.derived.jscbindings.mk -endif -ifeq ($(JAVASCRIPT_ENGINE),v8) -include $(LOCAL_PATH)/Android.derived.v8bindings.mk -endif - -# Include source files for android WebKit port -d := Source/WebKit -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - -# Redefine LOCAL_PATH here so the build system is not confused -LOCAL_PATH := $(BASE_PATH) - -# Define our compiler flags -LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format -LOCAL_CFLAGS += -fno-strict-aliasing -LOCAL_CFLAGS += -include "WebCorePrefix.h" -LOCAL_CFLAGS += -fvisibility=hidden -LOCAL_CFLAGS += -DALWAYS_INLINE=inline -# Make sure assert.h is included before assert is defined -LOCAL_CFLAGS += -include "assert.h" -ifeq ($(HTTP_STACK),chrome) -LOCAL_CFLAGS += -DGOOGLEURL -LOCAL_CFLAGS += -DWTF_USE_CHROME_NETWORK_STACK -endif # HTTP_STACK == chrome -LOCAL_CPPFLAGS := -Wno-sign-promo - -# Adds GL and EGL extensions for the GL backend -LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES - -# Enable JSC JIT if JSC is used and ENABLE_JSC_JIT environment -# variable is set to true -ifeq ($(JAVASCRIPT_ENGINE),jsc) -ifeq ($(ENABLE_JSC_JIT),true) -LOCAL_CFLAGS += -DENABLE_ANDROID_JSC_JIT=1 -endif -endif - -ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -Darm -# remove this warning: "note: the mangling of 'va_list' has changed in GCC 4.4" -LOCAL_CFLAGS += -Wno-psabi -endif - -# need a flag to tell the C side when we're on devices with large memory -# budgets (i.e. larger than the low-end devices that initially shipped) -ifeq ($(ARCH_ARM_HAVE_VFP),true) -LOCAL_CFLAGS += -DANDROID_LARGE_MEMORY_DEVICE -endif - -ifeq ($(ENABLE_SVG),true) -LOCAL_CFLAGS += -DENABLE_SVG=1 -DENABLE_SVG_ANIMATION=1 -endif - -ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),false) -LOCAL_CFLAGS += -DWTF_USE_ACCELERATED_COMPOSITING=0 -endif - -ifeq ($(ENABLE_WTF_USE_ACCELERATED_COMPOSITING),true) -LOCAL_CFLAGS += -DWTF_USE_ACCELERATED_COMPOSITING=1 -endif - -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_CFLAGS += -DANDROID_INSTRUMENT -endif - -# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only -# valid on Linux -LOCAL_LDLIBS += -lpthread -ldl - -# Build the list of shared libraries -LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ - libnativehelper \ - libsqlite \ - libskia \ - libutils \ - libui \ - libcutils \ - libicuuc \ - libicui18n \ - libmedia \ - libsurfaceflinger_client \ - libEGL \ - libGLESv2 \ - libgui - -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_SHARED_LIBRARIES += libhardware_legacy -endif - -# We have to use the android version of libdl when we are not on the simulator -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl libstlport -# We have to fake out some headers when using stlport. -LOCAL_C_INCLUDES += \ - external/chromium/android -include external/stlport/libstlport.mk -endif - -# We need Harfbuzz library to support complex scripts(Arabic, Thai, Hindi...). -ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true) -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - external/harfbuzz/src \ - external/harfbuzz/contrib -LOCAL_SHARED_LIBRARIES += libharfbuzz -LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1 -endif - -# Build the list of static libraries -LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation -ifeq ($(JAVASCRIPT_ENGINE),v8) -LOCAL_STATIC_LIBRARIES += libv8 -endif - -ifeq ($(HTTP_STACK),chrome) -LOCAL_STATIC_LIBRARIES += libchromium_net -LOCAL_SHARED_LIBRARIES += libcrypto libssl libz -endif # HTTP_STACK == chrome - -ifeq ($(ENABLE_AUTOFILL),true) -LOCAL_SHARED_LIBRARIES += libexpat -endif - -# Redefine LOCAL_SRC_FILES to be all the WebKit source files -LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) - -# Define this for use in other makefiles. -WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES) -WEBKIT_CFLAGS := $(LOCAL_CFLAGS) -WEBKIT_CPPFLAGS := $(LOCAL_CPPFLAGS) -WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES) -WEBKIT_LDLIBS := $(LOCAL_LDLIBS) -WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) -WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) - -# Build the library all at once -include $(BUILD_STATIC_LIBRARY) - -ifeq ($(JAVASCRIPT_ENGINE),jsc) -# Now build libjs as a static library. -include $(CLEAR_VARS) -LOCAL_MODULE := libjs -LOCAL_LDLIBS := $(WEBKIT_LDLIBS) -LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) -LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) -LOCAL_CFLAGS := $(WEBKIT_CFLAGS) -# Include source files for JavaScriptCore -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -# Cannot use base_intermediates as this is a new module -intermediates := $(call local-intermediates-dir) -include $(LOCAL_PATH)/Android.mk -# Redefine LOCAL_SRC_FILES with the correct prefix -LOCAL_SRC_FILES := $(addprefix $d/,$(LOCAL_SRC_FILES)) -# Use the base path to resolve file names -LOCAL_PATH := $(BASE_PATH) -# Append jsc intermediate include paths to the WebKit include list. -LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \ - $(intermediates) \ - $(intermediates)/parser \ - $(intermediates)/runtime \ -# Build libjs -include $(BUILD_STATIC_LIBRARY) -endif # JAVASCRIPT_ENGINE == jsc - -# Now build the shared library using only the exported jni entry point. This -# will strip out any unused code from the entry point. -include $(CLEAR_VARS) -# if you need to make webcore huge (for debugging), enable this line -LOCAL_MODULE := libwebcore -LOCAL_LDLIBS := $(WEBKIT_LDLIBS) -LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) -LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) -ifeq ($(JAVASCRIPT_ENGINE),jsc) -LOCAL_STATIC_LIBRARIES += libjs -endif -LOCAL_LDFLAGS := -fvisibility=hidden -LOCAL_CFLAGS := $(WEBKIT_CFLAGS) -LOCAL_CPPFLAGS := $(WEBKIT_CPPFLAGS) -LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) -LOCAL_PATH := $(BASE_PATH) -LOCAL_SRC_FILES := \ - Source/WebKit/android/jni/WebCoreJniOnLoad.cpp - -ifeq ($(ENABLE_AUTOFILL),true) -# AutoFill requires some cpp files from Chromium to link with -# libchromium_net. We cannot compile them into libchromium_net -# because they have cpp file extensions, not .cc. -LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1 -LOCAL_SRC_FILES += \ - 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 -# headers that this file pulls in are generated during the build of webcore. -# We make all of our object files depend on those files so that they are built -# before we try to compile the file. -LOCAL_ADDITIONAL_DEPENDENCIES := $(filter %.h, $(WEBKIT_GENERATED_SOURCES)) -include $(BUILD_SHARED_LIBRARY) - -# Build the wds client -include $(WEBKIT_PATH)/android/wds/client/Android.mk - -# Build the performance command line tool. -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 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 \ |