diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-23 15:31:45 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-23 16:38:22 +0100 |
| commit | 45ca37e14f3f68f52a77e0d06514716809ed89ab (patch) | |
| tree | 6fb388c4c0a6c4785c3f566687690fc64d33d640 | |
| parent | 32eb9c0c90a8800cdb31fe31b75ee08817545a23 (diff) | |
| download | external_webkit-45ca37e14f3f68f52a77e0d06514716809ed89ab.zip external_webkit-45ca37e14f3f68f52a77e0d06514716809ed89ab.tar.gz external_webkit-45ca37e14f3f68f52a77e0d06514716809ed89ab.tar.bz2 | |
Remove #if USE(CHROME_NETWORK_STACK) guards from headers
Change-Id: Ib3c3037ab3f62d0c9c49f53850be5ff5c4f2a525
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.h | 5 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | 4 |
3 files changed, 5 insertions, 18 deletions
@@ -223,12 +223,14 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(base_intermediates)/WebCore/html \ $(base_intermediates)/WebCore/platform -# The following includes are needed by the AutoFill feature. +# The following includes are needed by the AutoFill feature, or the chrome http +# stack LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebKit/chromium \ $(LOCAL_PATH)/WebKit/chromium/public \ external/chromium/chrome/browser \ external/chromium/chrome/renderer \ + external/chromium \ external/chromium/android \ external/chromium/chrome \ external/skia @@ -274,13 +276,6 @@ 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 \ - external/chromium/android -endif # HTTP_STACK == chrome - # Redefine LOCAL_PATH here so the build system is not confused LOCAL_PATH := $(BASE_PATH) @@ -289,10 +284,11 @@ LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format LOCAL_CFLAGS += -fno-strict-aliasing LOCAL_CFLAGS += -include "WebCorePrefix.h" LOCAL_CFLAGS += -fvisibility=hidden +# 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 -LOCAL_CFLAGS += -include "assert.h" endif # HTTP_STACK == chrome # Enable JSC JIT if JSC is used and ENABLE_JSC_JIT environment diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.h b/WebKit/android/WebCoreSupport/WebRequestContext.h index 5e6a84e..d93fd24 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.h +++ b/WebKit/android/WebCoreSupport/WebRequestContext.h @@ -26,11 +26,8 @@ #ifndef WebRequestContext_h #define WebRequestContext_h -// libchromium_net is not available on the simulator for now // Cannot forward declare the chrome classes since this is // a subclass of a chrome class. -#if USE(CHROME_NETWORK_STACK) - #include "ChromiumIncludes.h" #include "PlatformString.h" @@ -60,6 +57,4 @@ private: } // namespace android -#endif // USE(CHROME_NETWORK_STACK) - #endif diff --git a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h index 23086cd..b568c91 100644 --- a/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h +++ b/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h @@ -26,8 +26,6 @@ #ifndef WebUrlLoaderClient_h #define WebUrlLoaderClient_h -#if USE(CHROME_NETWORK_STACK) - #include "ChromiumIncludes.h" #include "RefCounted.h" #include "WebResponse.h" @@ -156,6 +154,4 @@ struct LoaderData { } // namespace android -#endif // USE(CHROME_NETWORK_STACK) - #endif |