From fdb264754f95052e2d1153095d6ab5daf25e7db6 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 19 Dec 2018 11:12:11 +0000 Subject: [PATCH] Bug 1515257 - Don't pretend there are ARM assembly sources in libaom. r=firefox-build-system-reviewers,ted There aren't any, and the code to actually convert them from .asm to gas that is expected by the moz.build is not even there, so if there were assembly sources, it would fail to build. Depends on D14946 Differential Revision: https://phabricator.services.mozilla.com/D14947 --HG-- extra : moz-landing-system : lando --- media/libaom/moz.build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/media/libaom/moz.build b/media/libaom/moz.build index 9579234d3163..de4f8887a2a7 100644 --- a/media/libaom/moz.build +++ b/media/libaom/moz.build @@ -61,14 +61,7 @@ elif CONFIG['CPU_ARCH'] == 'arm': LOCAL_INCLUDES += [ '/media/libaom/config/linux/arm/' ] EXPORTS.aom += [ 'config/linux/arm/config/aom_config.h' ] - arm_asm_files = files['ARM_SOURCES'] - - if CONFIG['VPX_AS_CONVERSION']: - SOURCES += sorted([ - "!%s.S" % f if f.endswith('.asm') else f for f in arm_asm_files - ]) - else: - SOURCES += sorted(arm_asm_files) + SOURCES += files['ARM_SOURCES'] for f in SOURCES: if f.endswith('neon.c'):