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

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

am 9b2b0527: Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm" 

* commit '9b2b0527':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm
parents 15319ded 9b2b0527

media/libstagefright/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -95,10 +95,10 @@ 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.

ifeq ($(TARGET_ARCH),arm)

  ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)

  ifneq ($(TARGET_ARCH),x86)

    USE_ALT_HTTP := true

  endif

endif