From 52af058eeab67aba8807d2d56f7c7df99c92cccb Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Wed, 1 Sep 2010 14:51:56 +0100
Subject: Using Chrome http as default.

Will use the not default stack if USE_ALT_HTTP is defined in the shell.

Change-Id: I8232c906dcdfaefbb03d3765eb8201407e2cef5b
---
 Android.mk   | 29 +++++++++++++++++++++--------
 CleanSpec.mk |  2 ++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Android.mk b/Android.mk
index ddae467..1786ae0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)
 
 
 # ************************************************
-- 
cgit v1.1