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.
# The Chrome stack can not be used with JSC and hence can not be used be used
# with the simulator.
ifeq ($(JAVASCRIPT_ENGINE),jsc)
- HTTP_STACK = android
+ 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.
external/skia/include/utils \
external/skia/src/ports \
external/sqlite/dist \
- frameworks/base/core/jni/android/graphics
+ frameworks/base/core/jni/android/graphics \
+ frameworks/base/include
LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
$(LOCAL_PATH)/WebCore \
$(LOCAL_PATH)/WebCore/loader/appcache \
$(LOCAL_PATH)/WebCore/loader/archive \
$(LOCAL_PATH)/WebCore/loader/archive/android \
+ $(LOCAL_PATH)/WebCore/loader/cache \
$(LOCAL_PATH)/WebCore/loader/icon \
$(LOCAL_PATH)/WebCore/notifications \
$(LOCAL_PATH)/WebCore/page \
$(LOCAL_PATH)/WebCore/platform/image-decoders/ico \
$(LOCAL_PATH)/WebCore/platform/image-decoders/jpeg \
$(LOCAL_PATH)/WebCore/platform/image-decoders/png \
+ $(LOCAL_PATH)/WebCore/platform/image-decoders/webp \
$(LOCAL_PATH)/WebCore/platform/mock \
$(LOCAL_PATH)/WebCore/platform/network \
$(LOCAL_PATH)/WebCore/platform/network/android \
$(LOCAL_PATH)/WebCore/svg/animation \
$(LOCAL_PATH)/WebCore/svg/graphics \
$(LOCAL_PATH)/WebCore/svg/graphics/filters \
+ $(LOCAL_PATH)/WebCore/svg/properties \
$(LOCAL_PATH)/WebCore/websockets \
$(LOCAL_PATH)/WebCore/workers \
$(LOCAL_PATH)/WebCore/xml
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
libmedia \
libsurfaceflinger_client \
libEGL \
- libGLESv2
+ libGLESv2 \
+ libgui
ifeq ($(WEBCORE_INSTRUMENTATION),true)
LOCAL_SHARED_LIBRARIES += libhardware_legacy
# 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)
# 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_PRELINK_MODULE := false
+#LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libwebcore
LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
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 := \