diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-16 14:14:44 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-16 14:14:44 -0800 |
| commit | 2285ad26b6524cc5a71f5282f8bd18a5ba9ce028 (patch) | |
| tree | 2802c186f1e48cf24fedc34e88ad8c46dfcb5211 | |
| parent | 2857538e8cd8c752b06ee75dd039791a186455b3 (diff) | |
| parent | 43005767df940db24e942aadd7e17790c12ea4aa (diff) | |
| download | external_webkit-2285ad26b6524cc5a71f5282f8bd18a5ba9ce028.zip external_webkit-2285ad26b6524cc5a71f5282f8bd18a5ba9ce028.tar.gz external_webkit-2285ad26b6524cc5a71f5282f8bd18a5ba9ce028.tar.bz2 | |
Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -67,11 +67,13 @@ ifneq ($(JAVASCRIPT_ENGINE),jsc) endif 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 |