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

Merge "Only check ARCH_ARM_HAVE_ARMV7A if TARGET_ARCH is arm"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2012-06-13 10:34:02 -07:00
committed by android code review
parent 460abe97b0 30768cfd28
commit 9b2b0527cc
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 # currently must follow the same logic to determine how webkit was built and
# if it's safe to link against libchromium.net # 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. # use the Chrome http stack either.
ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true) ifeq ($(TARGET_ARCH),arm)
ifneq ($(TARGET_ARCH),x86) ifneq ($(strip $(ARCH_ARM_HAVE_ARMV7A)),true)
USE_ALT_HTTP := true USE_ALT_HTTP := true
endif endif
endif endif