Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd9adbce authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 00f94e88: Merge "Enable chromium http stack for x86"

* commit '00f94e88':
  Enable chromium http stack for x86
parents 78821e8e 00f94e88
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -95,11 +95,13 @@ 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)
  ifneq ($(TARGET_ARCH),x86)
      USE_ALT_HTTP := true
  endif
endif

# See if the user has specified a stack they want to use
HTTP_STACK = $(HTTP)