diff options
| author | Andrei Popescu <andreip@google.com> | 2010-03-10 14:19:32 +0000 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2010-03-10 14:54:14 +0000 |
| commit | 7316d6361d0f8087f0f514280bf0380b29257db2 (patch) | |
| tree | 9f40940bb341144c00682c1656c790547349e70f /Android.mk | |
| parent | af63f0d78dd59f396707681f28fe70ab300fcd8d (diff) | |
| download | external_webkit-7316d6361d0f8087f0f514280bf0380b29257db2.zip external_webkit-7316d6361d0f8087f0f514280bf0380b29257db2.tar.gz external_webkit-7316d6361d0f8087f0f514280bf0380b29257db2.tar.bz2 | |
Switch default build to use V8 on Passion and Sholes.
A small step in the makefile, a giant step for the browser.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -40,13 +40,26 @@ LOCAL_PATH := $(call my-dir) # Read JS_ENGINE environment variable JAVASCRIPT_ENGINE = $(JS_ENGINE) +# The default / alternative engine depends on the device class. +# On devices with a lot of memory (e.g. Passion/Sholes), the +# default is V8. On everything else, the only choice is JSC. +# TODO: use ARCH_ARM_HAVE_ARMV7 once that variable is added to +# the build system. +ifeq ($(ARCH_ARM_HAVE_VFP),true) + DEFAULT_ENGINE = v8 + ALT_ENGINE = jsc +else + DEFAULT_ENGINE = jsc + ALT_ENGINE = jsc +endif + ifneq ($(JAVASCRIPT_ENGINE),jsc) ifneq ($(JAVASCRIPT_ENGINE),v8) # No JS engine is specified, pickup the one we want as default. ifeq ($(USE_ALT_JS_ENGINE),true) - JAVASCRIPT_ENGINE = v8 + JAVASCRIPT_ENGINE = $(ALT_ENGINE) else - JAVASCRIPT_ENGINE = jsc + JAVASCRIPT_ENGINE = $(DEFAULT_ENGINE) endif endif endif |