diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-01 10:19:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-01 10:19:24 -0700 |
| commit | e7a439253f03e258c35f31fed37bf8e460f95158 (patch) | |
| tree | db51db791e56b6df7936d3620843519f81ec451d | |
| parent | 312087523aea90b1b42c0c9b105ec9be8224df12 (diff) | |
| parent | 52af058eeab67aba8807d2d56f7c7df99c92cccb (diff) | |
| download | external_webkit-e7a439253f03e258c35f31fed37bf8e460f95158.zip external_webkit-e7a439253f03e258c35f31fed37bf8e460f95158.tar.gz external_webkit-e7a439253f03e258c35f31fed37bf8e460f95158.tar.bz2 | |
Merge "Using Chrome http as default."
| -rw-r--r-- | Android.mk | 29 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 |
2 files changed, 23 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) diff --git a/CleanSpec.mk b/CleanSpec.mk index ce051f9..e5be1c8 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -62,6 +62,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_int $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates) # ************************************************ |