From 30768cfd289f4b6b19d3b505f0a85158157f0de3 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Fri, 24 Feb 2012 08:48:05 +0800 Subject: [PATCH] Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm This patch is required to enable chrome http stack on x86. This is just clean-up to make it the same as the WebKit change: https://android-review.googlesource.com/#/c/30891 Change-Id: Ie88ab86de9a32de5e8b02adb129e01203dd5637a --- media/libstagefright/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index df00581bff504..ba54dcb1376ba 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -95,11 +95,11 @@ LOCAL_STATIC_LIBRARIES := \ # currently must follow the same logic to determine how webkit was built and # if it's safe to link against libchromium.net -# V8 also requires an ARMv7 & x86 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) - ifneq ($(TARGET_ARCH),x86) - USE_ALT_HTTP := true +ifeq ($(TARGET_ARCH),arm) + ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) + USE_ALT_HTTP := true endif endif