diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-08-12 17:59:23 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-08-12 17:59:23 +0100 |
| commit | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (patch) | |
| tree | 579e3222bca50bb2fce3cb9c11e0fd50654103b9 | |
| parent | 1338f824ca6c264f4bc118d7e945e45132cf93b4 (diff) | |
| download | external_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.zip external_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.tar.gz external_webkit-f3d41ba51d86bf719c7a65ab5297aea3c17e2d98.tar.bz2 | |
Build fix. Guard chromium headers, and never use chrome stack in simulator.
Change-Id: Iaf9a9de73870c497b9c925af3b1637a07b399640
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/WebRequestContext.h | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -79,10 +79,12 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc) endif # Read the HTTP_STACK environment variable, default is android +ifeq ($(TARGET_SIMULATOR),false) HTTP_STACK = $(HTTP) ifneq ($(HTTP_STACK),chrome) HTTP_STACK = android endif +endif BASE_PATH := $(call my-dir) include $(CLEAR_VARS) diff --git a/WebKit/android/WebCoreSupport/WebRequestContext.h b/WebKit/android/WebCoreSupport/WebRequestContext.h index c2f0aaf..0ff081c 100644 --- a/WebKit/android/WebCoreSupport/WebRequestContext.h +++ b/WebKit/android/WebCoreSupport/WebRequestContext.h @@ -26,6 +26,11 @@ #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 "net/http/http_cache.h" #include "net/url_request/url_request_context.h" @@ -46,4 +51,6 @@ private: } // namespace android +#endif // USE(CHROME_NETWORK_STACK) + #endif |