Cleanspec so the reverting of the chrome http stack takes effect.

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

diff --git a/Android.mk b/Android.mk
index 5d7496b..ddae467 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -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.
+ifneq ($(TARGET_SIMULATOR),true)
+DEFAULT_ENGINE = v8
+ALT_ENGINE = jsc
 else
-    DEFAULT_ENGINE = jsc
-    ALT_ENGINE = jsc
+DEFAULT_ENGINE = jsc
+ALT_ENGINE = jsc
 endif
 
 ifneq ($(JAVASCRIPT_ENGINE),jsc)
@@ -79,9 +76,14 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc)
 endif
 
 # Read the HTTP_STACK environment variable, default is android
+ifneq ($(TARGET_SIMULATOR),true)
 HTTP_STACK = $(HTTP)
-ifneq ($(HTTP_STACK),chrome)
-  HTTP_STACK = android
+ifeq ($(HTTP_STACK),chrome)
+  # Chrome net stack has dependencies on V8.
+  ifeq ($(JAVASCRIPT_ENGINE), v8)
+    HTTP_STACK = chrome
+  endif
+endif
 endif
 
 BASE_PATH := $(call my-dir)
@@ -257,7 +259,7 @@ LOCAL_CFLAGS += -include "WebCorePrefix.h"
 LOCAL_CFLAGS += -fvisibility=hidden
 ifeq ($(HTTP_STACK),chrome)
 LOCAL_CFLAGS += -DGOOGLEURL
-LOCAL_CFLAGS += -DCHROME_HTTP_STACK
+LOCAL_CFLAGS += -DWTF_USE_CHROME_NETWORK_STACK
 LOCAL_CFLAGS += -include "assert.h"
 endif # HTTP_STACK == chrome
 
@@ -315,13 +317,6 @@ LOCAL_SHARED_LIBRARIES := \
        libmedia \
        libsurfaceflinger_client
 
-ifeq ($(HTTP_STACK),chrome)
-LOCAL_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) \
-       libssl \
-       libcrypto \
-       libchromium_net
-endif # HTTP_STACK == chrome
-
 ifeq ($(WEBCORE_INSTRUMENTATION),true)
 LOCAL_SHARED_LIBRARIES += libhardware_legacy
 endif
@@ -347,6 +342,11 @@ ifeq ($(JAVASCRIPT_ENGINE),v8)
 LOCAL_STATIC_LIBRARIES += libv8
 endif
 
+ifeq ($(HTTP_STACK),chrome)
+LOCAL_STATIC_LIBRARIES += libchromium_net
+LOCAL_SHARED_LIBRARIES += libcrypto libssl libz
+endif # HTTP_STACK == chrome
+
 # Redefine LOCAL_SRC_FILES to be all the WebKit source files
 LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES)
 
@@ -393,6 +393,10 @@ endif  # JAVASCRIPT_ENGINE == jsc
 # will strip out any unused code from the entry point.
 include $(CLEAR_VARS)
 # if you need to make webcore huge (for debugging), enable this line
+ifeq ($(HTTP_STACK),chrome)
+# Too large for the space with chromium linked in
+LOCAL_PRELINK_MODULE := false
+endif
 #LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libwebcore
 LOCAL_LDLIBS := $(WEBKIT_LDLIBS)