Skip to content

Commit 30768cf

Browse files
cwhuangandroid-x86
authored andcommitted
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
1 parent a10cc89 commit 30768cf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

media/libstagefright/Android.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ LOCAL_STATIC_LIBRARIES := \
9595
# currently must follow the same logic to determine how webkit was built and
9696
# if it's safe to link against libchromium.net
9797

98-
# V8 also requires an ARMv7 & x86 CPU, and since we must use jsc, we cannot
98+
# On ARM, V8 also requires an ARMv7 CPU, and since we must use jsc, we cannot
9999
# use the Chrome http stack either.
100-
ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
101-
ifneq ($(TARGET_ARCH),x86)
102-
USE_ALT_HTTP := true
100+
ifeq ($(TARGET_ARCH),arm)
101+
ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
102+
USE_ALT_HTTP := true
103103
endif
104104
endif
105105

0 commit comments

Comments
 (0)