Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm

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

diff --git a/Android.mk b/Android.mk
index 54837c3..da77333 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -66,16 +66,14 @@ 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
+# On ARM, 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
+ifeq ($(TARGET_ARCH),arm)
+  ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
+    JAVASCRIPT_ENGINE := jsc
+    USE_ALT_HTTP := true
+  endif
 endif
 
 # See if the user has specified a stack they want to use
@@ -366,6 +364,7 @@ LOCAL_LDLIBS += -lpthread -ldl
 
 # Build the list of shared libraries
 LOCAL_SHARED_LIBRARIES := \
+       libandroid \
        libandroid_runtime \
        libnativehelper \
        libsqlite \
@@ -376,23 +375,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)
@@ -410,8 +410,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)