Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-webkit: Commit

external/webkit


Commit MetaInfo

Revision5f639410b7d78fbbe3333f3e60e04c9ffb85bbd9 (tree)
Time2012-02-21 20:48:27
AuthorChih-Wei Huang <cwhuang@andr...>
CommiterChih-Wei Huang

Log Message

Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm

It only makes sense to check ARCH_ARM_HAVE_ARMV7A if the arch is arm.

This patch is required to enable chrome http stack on x86.

Change-Id: Ie59fc1a0a44f79a403501be96766ed825f6a7e72

Change Summary

Incremental Difference

--- a/Android.mk
+++ b/Android.mk
@@ -67,11 +67,13 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc)
6767 endif
6868 endif
6969
70-# V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot
70+# On ARM, V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot
7171 # use the Chrome http stack either.
72-ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
73- JAVASCRIPT_ENGINE := jsc
74- USE_ALT_HTTP := true
72+ifeq ($(TARGET_ARCH),arm)
73+ ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
74+ JAVASCRIPT_ENGINE := jsc
75+ USE_ALT_HTTP := true
76+ endif
7577 endif
7678
7779 # See if the user has specified a stack they want to use
Show on old repository browser