From 9a8d8723cd9c45c526a7c46d1e7d343e50e4e119 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 Aug 2010 16:26:49 +0100
Subject: Build fix for JSC The new net stack has dependencies on V8 and so we
 cannot use it in conjunction with JSC.

Fix b/2920038

Change-Id: If39db4732a66b6d3c25dba8816a3205d2bb55777
---
 Android.mk   | 5 ++++-
 CleanSpec.mk | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 8caada9..b6e318e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,7 +82,10 @@ endif
 ifeq ($(TARGET_SIMULATOR),false)
 HTTP_STACK = $(HTTP)
 ifneq ($(HTTP_STACK),android)
-  HTTP_STACK = chrome
+  # Chrome net stack has dependencies on V8.
+  ifeq ($(JAVASCRIPT_ENGINE), v8)
+    HTTP_STACK = chrome
+  endif
 endif
 endif
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index acac669..31f5820 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -56,6 +56,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)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-- 
cgit v1.1