Merge "Do not merge: fix dns prefetch, multiply range" into gingerbread

[android-x86/external-webkit.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 6aae0b7..21f6cf4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -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
@@ -265,7 +278,6 @@ LOCAL_SHARED_LIBRARIES := \
        libui \
        libcutils \
        libicuuc \
-       libicudata \
        libicui18n \
        libmedia \
        libsurfaceflinger_client