]> granicus.if.org Git - libvpx/commitdiff
Don't include x86inc.asm on non-x86 targets
authorJohn Koleszar <jkoleszar@google.com>
Thu, 17 Jan 2013 00:44:33 +0000 (16:44 -0800)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 17 Jan 2013 00:44:33 +0000 (16:44 -0800)
This file is currently unused, as the asm that depended on it has been
disabled for the current roll into Chromium. It's expected that it
will return in some form, so wrap it in an x86 check rather than
deleting it. This extra file isn't really an issue with the libvpx
build system, but affects the gyp builds since on ARM (android) it
tries to do the ADS->GAS conversion on all .asm files reported in
libvpx_srcs.txt.

Change-Id: I080fbc22ab59fff41264ae230a48fa753594135b

libs.mk

diff --git a/libs.mk b/libs.mk
index 1f0ade34d42fbd6613112ea54f8ac4f42ea56ae9..77ff2fc42e33b835bab869261d885854dbfdf75b 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -167,7 +167,9 @@ CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emmintrin_compat.h
 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_once.h
 CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c
 INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c
+ifeq ($(ARCH_X86)$(ARCH_X86_64),yes)
 CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm
+endif
 CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com
 CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc
 CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec