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 374931c..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.
@@ -366,6 +362,7 @@ LOCAL_LDLIBS += -lpthread -ldl
 
 # Build the list of shared libraries
 LOCAL_SHARED_LIBRARIES := \
+       libandroid \
        libandroid_runtime \
        libnativehelper \
        libsqlite \
@@ -388,14 +385,12 @@ 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)
@@ -413,8 +408,7 @@ 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)