diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-01 14:51:56 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-01 15:54:41 +0100 |
| commit | 52af058eeab67aba8807d2d56f7c7df99c92cccb (patch) | |
| tree | c8bcd0e91a205d4c99741ef5571cdf7d9d6e2375 /Android.mk | |
| parent | 0791b1868c46ccb65512ac34b0fc06c43759eda9 (diff) | |
| download | external_webkit-52af058eeab67aba8807d2d56f7c7df99c92cccb.zip external_webkit-52af058eeab67aba8807d2d56f7c7df99c92cccb.tar.gz external_webkit-52af058eeab67aba8807d2d56f7c7df99c92cccb.tar.bz2 | |
Using Chrome http as default.
Will use the not default stack if USE_ALT_HTTP is defined in the shell.
Change-Id: I8232c906dcdfaefbb03d3765eb8201407e2cef5b
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 29 |
1 files changed, 21 insertions, 8 deletions
@@ -75,15 +75,28 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc) endif endif -# Read the HTTP_STACK environment variable, default is android -ifneq ($(TARGET_SIMULATOR),true) -HTTP_STACK = $(HTTP) -ifeq ($(HTTP_STACK),chrome) - # Chrome net stack has dependencies on V8. - ifeq ($(JAVASCRIPT_ENGINE), v8) - HTTP_STACK = chrome - endif +# We default to the Chrome HTTP stack on everything except the simulator, or +# if V8 is not used +DEFAULT_HTTP = chrome +ALT_HTTP = android +# Turn on chrome stack for everything but simulator +ifeq ($(TARGET_SIMULATOR),true) + DEFAULT_HTTP = android +endif +# Turn off chrome stack if JAVASCRIPT_ENGINE is not v8 +ifneq ($(JAVASCRIPT_ENGINE),v8) + DEFAULT_HTTP = android endif + +ifneq ($(HTTP_STACK),chrome) + ifneq ($(HTTP_STACK),android) + # No HTTP stack is specified, pickup the one we want as default. + ifeq ($(USE_ALT_HTTP),true) + HTTP_STACK = $(ALT_HTTP) + else + HTTP_STACK = $(DEFAULT_HTTP) + endif + endif endif BASE_PATH := $(call my-dir) |