Only support saveWebArchive for (X)HTML

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

diff --git a/Android.mk b/Android.mk
index f2ba162..0bddbc1 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 \
@@ -356,7 +364,8 @@ LOCAL_SHARED_LIBRARIES := \
        libmedia \
        libsurfaceflinger_client \
        libEGL \
-       libGLESv2
+       libGLESv2 \
+       libgui
 
 ifeq ($(WEBCORE_INSTRUMENTATION),true)
 LOCAL_SHARED_LIBRARIES += libhardware_legacy
@@ -442,7 +451,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)