Bug 1253076 - Handle the case defines are not present to avoid artifact build bustage when processing symbols files. r=glandium
authorChris Manchester <cmanchester@mozilla.com>
Wed, 02 Mar 2016 16:25:56 -0800
changeset 322899 624b22ec6462b2c64934c193c3a5592becc2dc96
parent 322898 29dec7e96a9c87e54b5ec1b169df10c94c299f53
child 322900 b4f60d9123df8d93f001893923fc6191b0e09b37
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1253076
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1253076 - Handle the case defines are not present to avoid artifact build bustage when processing symbols files. r=glandium MozReview-Commit-ID: 25oUlS12hec
python/mozbuild/mozbuild/frontend/emitter.py
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -565,19 +565,22 @@ class TreeMetadataEmitter(LoggingMixin):
                 if is_component and not context['NO_COMPONENTS_MANIFEST']:
                     yield ChromeManifestEntry(context,
                         'components/components.manifest',
                         ManifestBinaryComponent('components', lib.lib_name))
                 if symbols_file:
                     script = mozpath.join(
                         mozpath.dirname(mozpath.dirname(__file__)),
                         'action', 'generate_symbols_file.py')
+                    defines = ()
+                    if lib.defines:
+                        defines = lib.defines.get_defines()
                     yield GeneratedFile(context, script,
                         'generate_symbols_file', lib.symbols_file,
-                        [symbols_file.full_path], lib.defines.get_defines())
+                        [symbols_file.full_path], defines)
             if static_lib:
                 lib = StaticLibrary(context, libname, **static_args)
                 self._libs[libname].append(lib)
                 self._linkage.append((context, lib, 'USE_LIBS'))
                 has_linkables = True
 
             if lib_defines:
                 if not libname: