diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-03-22 18:15:40 +0000 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-15 11:27:25 +0100 |
| commit | f48006ff278822e558c43fa7d6635f0ff34342b6 (patch) | |
| tree | 92392399395fb3bce4566ae9bbd5e33fccce6970 /Android.mk | |
| parent | fd88d7ed6810e08b8d8c4512effc4da5e9c08265 (diff) | |
| download | external_webkit-f48006ff278822e558c43fa7d6635f0ff34342b6.zip external_webkit-f48006ff278822e558c43fa7d6635f0ff34342b6.tar.gz external_webkit-f48006ff278822e558c43fa7d6635f0ff34342b6.tar.bz2 | |
Initial check-in of the external/webkit part of the chrome http stack.
There are no changes in WebCore anymore, the new files live in WebKit/android/WebCoreSupport. There are two WebCore functions implemented in WebUrlLoader.cpp, they are
one-liners that call a WebKit function or return a bool.
Only async downloads are implemented so far. There are crashes on some websites, but better to get things checked in, and then start fixing outstanding issues.
I have tried to address all the issues from the reviews, but since the code has changed a bit I have not replied to each of them.
Change-Id: Ie83798e2f82ce78cb00ee5a4a558c9d8085c9567
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -78,6 +78,12 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc) endif endif +# Read the HTTP_STACK environment variable, default is android +HTTP_STACK = $(HTTP) +ifneq ($(HTTP_STACK),chrome) + HTTP_STACK = android +endif + BASE_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -233,6 +239,12 @@ intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) +ifeq ($(HTTP_STACK),chrome) +LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ + $(LOCAL_PATH)/WebKit/chromium/public \ + external/chromium +endif # HTTP_STACK == chrome + # Redefine LOCAL_PATH here so the build system is not confused LOCAL_PATH := $(BASE_PATH) @@ -241,6 +253,11 @@ LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format LOCAL_CFLAGS += -fno-strict-aliasing LOCAL_CFLAGS += -include "WebCorePrefix.h" LOCAL_CFLAGS += -fvisibility=hidden +ifeq ($(HTTP_STACK),chrome) +LOCAL_CFLAGS += -DGOOGLEURL +LOCAL_CFLAGS += -DCHROME_HTTP_STACK +LOCAL_CFLAGS += -include "assert.h" +endif # HTTP_STACK == chrome # Enable JSC JIT if JSC is used and ENABLE_JSC_JIT environment # variable is set to true @@ -297,6 +314,13 @@ LOCAL_SHARED_LIBRARIES := \ libmedia \ libsurfaceflinger_client +ifeq ($(HTTP_STACK),chrome) +LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) \ + libssl \ + libcrypto \ + libchromium_net +endif # HTTP_STACK == chrome + ifeq ($(WEBCORE_INSTRUMENTATION),true) LOCAL_SHARED_LIBRARIES += libhardware_legacy endif |