From 6da57e25bc8ca7a875132decceef5c322158d895 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Wed, 18 Dec 2013 21:52:21 -0500 Subject: [PATCH] Bug 940708 - Part 3: Handle asm sources for unified webrtc builds; r=gps --HG-- extra : rebase_source : 75f72fa64c0cde4c63b3ef5c09964cdf99fb32a2 --- python/mozbuild/mozbuild/frontend/gyp_reader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/frontend/gyp_reader.py b/python/mozbuild/mozbuild/frontend/gyp_reader.py index 29a81b8b095a..dca48ad9656c 100644 --- a/python/mozbuild/mozbuild/frontend/gyp_reader.py +++ b/python/mozbuild/mozbuild/frontend/gyp_reader.py @@ -162,12 +162,13 @@ def read_from_gyp(config, path, output, vars, non_unified_sources = set()): name = name[3:] # The sandbox expects an unicode string. sandbox['LIBRARY_NAME'] = name.decode('utf-8') - # gyp files contain headers in sources lists. + # gyp files contain headers and asm sources in sources lists. sources = set(mozpath.normpath(mozpath.join(sandbox['SRCDIR'], f)) for f in spec.get('sources', []) if mozpath.splitext(f)[-1] != '.h') + asm_sources = set(f for f in sources if f.endswith('.S')) - unified_sources = sources - non_unified_sources + unified_sources = sources - non_unified_sources - asm_sources sources -= unified_sources all_sources |= sources # The sandbox expects alphabetical order when adding sources