Merge "Merge WebKit at Chromium 9.0.597.83: Trivial merge by git." into honeycomb

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

diff --git a/Android.mk b/Android.mk
index 79e968e..744b81a 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -73,6 +73,13 @@ ifeq ($(TARGET_SIMULATOR),true)
   JAVASCRIPT_ENGINE = jsc
 endif
 
+# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot
+# use the Chrome http stack either.
+ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
+  JAVASCRIPT_ENGINE := jsc
+  USE_ALT_HTTP := true
+endif
+
 # See if the user has specified a stack they want to use
 HTTP_STACK = $(HTTP)
 # We default to the Chrome HTTP stack.
@@ -146,7 +153,8 @@ LOCAL_C_INCLUDES := \
        external/skia/include/utils \
        external/skia/src/ports \
        external/sqlite/dist \
-       frameworks/base/core/jni/android/graphics
+       frameworks/base/core/jni/android/graphics \
+       frameworks/base/include
 
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(LOCAL_PATH)/WebCore \
@@ -290,6 +298,7 @@ LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format
 LOCAL_CFLAGS += -fno-strict-aliasing
 LOCAL_CFLAGS += -include "WebCorePrefix.h"
 LOCAL_CFLAGS += -fvisibility=hidden
+LOCAL_CFLAGS += -DALWAYS_INLINE=inline
 # Make sure assert.h is included before assert is defined
 LOCAL_CFLAGS += -include "assert.h"
 ifeq ($(HTTP_STACK),chrome)
@@ -441,7 +450,7 @@ 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
-LOCAL_PRELINK_MODULE := false
+#LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libwebcore
 LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
 LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)