summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-12-17 13:20:29 +0000
committerSteve Block <steveblock@google.com>2010-12-17 13:20:29 +0000
commitb48ad822c68e606bc3874b6c83663b6c34a04208 (patch)
tree72abfecca79f29f820c38b88aed7c4f10791376b /Android.mk
parent74427af10b1794f0e99b7e7a451c4a40902c98f4 (diff)
downloadexternal_webkit-b48ad822c68e606bc3874b6c83663b6c34a04208.zip
external_webkit-b48ad822c68e606bc3874b6c83663b6c34a04208.tar.gz
external_webkit-b48ad822c68e606bc3874b6c83663b6c34a04208.tar.bz2
Fail when building with JSC and the Chrome HTTP stack
This seems better than silently switching to the Android HTTP stack, which could be confusing. Change-Id: I9396beeed1e5803fe5ab16ce0d232dc5d0683f0a
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index d613a0f..79e968e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,7 +93,9 @@ endif
# The Chrome stack can not be used with JSC and hence can not be used be used
# with the simulator.
ifeq ($(JAVASCRIPT_ENGINE),jsc)
- HTTP_STACK = android
+ ifeq ($(HTTP_STACK),chrome)
+ $(error Can not build with JSC and the Chrome HTTP stack)
+ endif
endif
# Read the environment variable to determine if Autofill is compiled.