diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-18 12:53:00 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-18 12:58:31 +0100 |
| commit | c81f2c434697af1cb17d5d43bc6599cb096383c2 (patch) | |
| tree | f337951357054c46f69232f51d8a84f2e185cb70 | |
| parent | af55f2069e35150538b12690c2c881579443cf43 (diff) | |
| download | external_webkit-c81f2c434697af1cb17d5d43bc6599cb096383c2.zip external_webkit-c81f2c434697af1cb17d5d43bc6599cb096383c2.tar.gz external_webkit-c81f2c434697af1cb17d5d43bc6599cb096383c2.tar.bz2 | |
Make V8 the default JS engine on all builds (except sim).
We used to use the ARCH_ARM_HAVE_VFP build flag to determine which
JS engine to use as we wanted to use JSC for performance reasons
on older hardware. This is not necessary anymore and so unless
specified with the JS_ENGINE environment variable or when building
on the simulator, we default to V8 instead of JSC.
Change-Id: I773af968d5a7e7a7882d8763de4f90f1d08104b3
| -rw-r--r-- | Android.mk | 17 | ||||
| -rw-r--r-- | CleanSpec.mk | 3 |
2 files changed, 10 insertions, 10 deletions
@@ -54,17 +54,14 @@ endif # 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 +# We default to the V8 JS engine on everything except the simulator where +# we stick with JSC. +ifeq ($(TARGET_SIMULATOR),false) +DEFAULT_ENGINE = v8 +ALT_ENGINE = jsc else - DEFAULT_ENGINE = jsc - ALT_ENGINE = jsc +DEFAULT_ENGINE = jsc +ALT_ENGINE = jsc endif ifneq ($(JAVASCRIPT_ENGINE),jsc) diff --git a/CleanSpec.mk b/CleanSpec.mk index 31f5820..586a7ae 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -58,6 +58,9 @@ $(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 |