Merge "fix viewport lagging a drawGL call behind" into ics-mr1

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

diff --git a/Android.mk b/Android.mk
index fb3a06d..623a35f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -66,10 +66,6 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc)
     endif
   endif
 endif
-# We can't use V8 on the simulator
-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.
@@ -151,8 +147,10 @@ LOCAL_C_INCLUDES := \
        external/libxslt \
        external/hyphenation \
        external/skia/emoji \
+       external/skia/gpu/include \
        external/skia/include/core \
        external/skia/include/effects \
+       external/skia/include/gpu \
        external/skia/include/images \
        external/skia/include/ports \
        external/skia/include/utils \
@@ -239,6 +237,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
        $(JAVASCRIPTCORE_PATH) \
        $(JAVASCRIPTCORE_PATH)/collector/handles \
+       $(JAVASCRIPTCORE_PATH)/heap \
        $(JAVASCRIPTCORE_PATH)/wtf \
        $(JAVASCRIPTCORE_PATH)/wtf/unicode \
        $(JAVASCRIPTCORE_PATH)/wtf/unicode/icu
@@ -363,6 +362,7 @@ LOCAL_LDLIBS += -lpthread -ldl
 
 # Build the list of shared libraries
 LOCAL_SHARED_LIBRARIES := \
+       libandroid \
        libandroid_runtime \
        libnativehelper \
        libsqlite \
@@ -373,23 +373,24 @@ LOCAL_SHARED_LIBRARIES := \
        libicuuc \
        libicui18n \
        libmedia \
-       libsurfaceflinger_client \
        libEGL \
        libGLESv2 \
        libgui
 
+ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5)
+LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client
+endif
+
 ifeq ($(WEBCORE_INSTRUMENTATION),true)
 LOCAL_SHARED_LIBRARIES += libhardware_legacy
 endif
 
-# We have to use the android version of libdl when we are not on the simulator
-ifneq ($(TARGET_SIMULATOR),true)
+# We have to use the android version of libdl
 LOCAL_SHARED_LIBRARIES += libdl libstlport
 # We have to fake out some headers when using stlport.
 LOCAL_C_INCLUDES += \
        external/chromium/android
 include external/stlport/libstlport.mk
-endif
 
 # We need Harfbuzz library to support complex scripts(Arabic, Thai, Hindi...).
 ifeq ($(SUPPORT_COMPLEX_SCRIPTS),true)
@@ -401,14 +402,13 @@ LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1
 endif
 
 # Build the list of static libraries
-LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation
+LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu
 ifeq ($(JAVASCRIPT_ENGINE),v8)
 LOCAL_STATIC_LIBRARIES += libv8
 endif
 
 ifeq ($(HTTP_STACK),chrome)
-LOCAL_STATIC_LIBRARIES += libchromium_net
-LOCAL_SHARED_LIBRARIES += libcrypto libssl libz
+LOCAL_SHARED_LIBRARIES += libcrypto libssl libz libchromium_net
 endif # HTTP_STACK == chrome
 
 ifeq ($(ENABLE_AUTOFILL),true)