Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9b2b0527ccbc00e2befa2b8554a7e045f5168203':
  Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm
This commit is contained in:
Jean-Baptiste Queru
2012-06-13 10:47:52 -07:00
committed by Android Git Automerger
parent 15319ded15 9b2b0527cc
commit cfe75518ef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/Android.mk
View File

@@ -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