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.
# We have to use bison 2.3
include $(BASE_PATH)/bison_check.mk
-WEBCORE_PATH := $(BASE_PATH)/WebCore
-WEBKIT_PATH := $(BASE_PATH)/WebKit
-JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
-WEBCORE_INTERMEDIATES_PATH := $(base_intermediates)/WebCore
+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 WebKit/android/icu first so that
+# Build our list of include paths. We include Source/WebKit/android/icu first so that
# 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.
external/libxslt \
external/hyphenation \
external/skia/emoji \
+ external/skia/gpu/include \
external/skia/include/core \
external/skia/include/effects \
+ external/skia/include/gpu \
external/skia/include/images \
external/skia/include/ports \
external/skia/include/utils \
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/ \
$(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 \
$(WEBKIT_PATH)/android/plugins
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
-<<<<<<< HEAD
$(JAVASCRIPTCORE_PATH) \
+ $(JAVASCRIPTCORE_PATH)/collector/handles \
+ $(JAVASCRIPTCORE_PATH)/heap \
$(JAVASCRIPTCORE_PATH)/wtf \
$(JAVASCRIPTCORE_PATH)/wtf/unicode \
$(JAVASCRIPTCORE_PATH)/wtf/unicode/icu
$(WEBCORE_INTERMEDIATES_PATH) \
$(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
+ $(WEBCORE_INTERMEDIATES_PATH)/platform \
+ $(WEBCORE_INTERMEDIATES_PATH)/xml
# 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 \
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)
endif
# Include source files for android WebKit port
-d := WebKit
-LOCAL_PATH := $(WEBKIT_PATH)
+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))
# Build the list of shared libraries
LOCAL_SHARED_LIBRARIES := \
+ libandroid \
libandroid_runtime \
libnativehelper \
libsqlite \
libicuuc \
libicui18n \
libmedia \
- libsurfaceflinger_client \
libEGL \
libGLESv2 \
libgui
+ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5)
+LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client
+endif
+
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)
+# We have to use the android version of libdl
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)
endif
# Build the list of static libraries
-LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation
+LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu
ifeq ($(JAVASCRIPT_ENGINE),v8)
LOCAL_STATIC_LIBRARIES += libv8
endif
ifeq ($(HTTP_STACK),chrome)
-LOCAL_STATIC_LIBRARIES += libchromium_net
-LOCAL_SHARED_LIBRARIES += libcrypto libssl libz
+LOCAL_SHARED_LIBRARIES += libcrypto libssl libz libchromium_net
endif # HTTP_STACK == chrome
ifeq ($(ENABLE_AUTOFILL),true)
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)
# 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
+# Do not attempt prelink this library. Needed to keep master-gpl happy, no
+# effect in master.
+# TODO: remove this when master-gpl is updated.
+LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libwebcore
LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
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
# 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
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