Permalink
Browse files

Merge "Enable chromium http stack for x86"

  • Loading branch information...
2 parents 1b34c1b + ba71cdc commit 00f94e88f96ed87c95ea65563396609c61e72dca Jean-Baptiste Queru committed with android code review May 3, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 media/libstagefright/Android.mk
@@ -95,10 +95,12 @@ 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 CPU, and since we must use jsc, we cannot
+# V8 also requires an ARMv7 & x86 CPU, and since we must use jsc, we cannot
# use the Chrome http stack either.
ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
- USE_ALT_HTTP := true
+ ifneq ($(TARGET_ARCH),x86)
+ USE_ALT_HTTP := true
+ endif
endif
# See if the user has specified a stack they want to use

0 comments on commit 00f94e8

Please sign in to comment.