From a4eb44a2d24585d25f812e49368b1acf09cbd1a7 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Wed, 19 Jan 2011 20:36:30 +0100
Subject: Fix browser build on non-ARMv7 configurations.

This is required to prevent the browser from crashing with a SIGILL
when running the full-eng product in the emulator.

Change-Id: I321130fe4d568c927999ae41503d2a5c24b3cbae
---
 Android.mk | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index f2ba162..4b4de04 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,6 +73,13 @@ ifeq ($(TARGET_SIMULATOR),true)
   JAVASCRIPT_ENGINE = jsc
 endif
 
+# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot
+# use the Chrome http stack either.
+ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
+  JAVASCRIPT_ENGINE := jsc
+  USE_ALT_HTTP := true
+endif
+
 # See if the user has specified a stack they want to use
 HTTP_STACK = $(HTTP)
 # We default to the Chrome HTTP stack.
-- 
cgit v1.1