diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-01-19 20:36:30 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-01-19 20:36:30 +0100 |
| commit | a4eb44a2d24585d25f812e49368b1acf09cbd1a7 (patch) | |
| tree | 640430229ec304311c09d4c6aae0d1d5439a210e /Android.mk | |
| parent | f42f297f9d1e499b6b54e6c73ddb46dbb4745ede (diff) | |
| download | external_webkit-a4eb44a2d24585d25f812e49368b1acf09cbd1a7.zip external_webkit-a4eb44a2d24585d25f812e49368b1acf09cbd1a7.tar.gz external_webkit-a4eb44a2d24585d25f812e49368b1acf09cbd1a7.tar.bz2 | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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. |