diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-18 05:51:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-18 05:51:02 -0700 |
| commit | e38221f9813b52fbb9b76bb38c76ab08e25e5bb9 (patch) | |
| tree | f4c00db92eb785026a8b80aa34e0daf21bec8713 | |
| parent | c5e6b092f1406104813248e52a2be6bc1c005943 (diff) | |
| parent | c81f2c434697af1cb17d5d43bc6599cb096383c2 (diff) | |
| download | external_webkit-e38221f9813b52fbb9b76bb38c76ab08e25e5bb9.zip external_webkit-e38221f9813b52fbb9b76bb38c76ab08e25e5bb9.tar.gz external_webkit-e38221f9813b52fbb9b76bb38c76ab08e25e5bb9.tar.bz2 | |
Merge "Make V8 the default JS engine on all builds (except sim)."
| -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 |