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
# Build the list of shared libraries
LOCAL_SHARED_LIBRARIES := \
+ libandroid \
libandroid_runtime \
libnativehelper \
libsqlite \
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)
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)