Bug 1308982 - Stop adding gyp directories to the DIRS make variable. r=gps
authorChris Manchester <cmanchester@mozilla.com>
Wed, 21 Dec 2016 16:28:28 -0800
changeset 374255 4b56c03c582de98a3c7ed0b92acac3c222ef53ef
parent 374254 83473785912756086d02d8ee3fa548729a8e599d
child 374256 763fc7845e8c152c9f7ab015de18ebee5207a268
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1308982
milestone53.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 1308982 - Stop adding gyp directories to the DIRS make variable. r=gps Due to an apparent bug, DIRS are being ouptut inconsistently for directories with code built by gyp files (as of this writing, they are output for child directories of media/webrtc but not for some other directories). The DIRS variable no longer drives compilation, so this was essentially a no-op. MozReview-Commit-ID: IMfjyrcsWyv
python/mozbuild/mozbuild/frontend/reader.py
--- a/python/mozbuild/mozbuild/frontend/reader.py
+++ b/python/mozbuild/mozbuild/frontend/reader.py
@@ -1171,17 +1171,16 @@ class BuildReader(object):
                                              action_overrides,
                                              non_unified_sources = non_unified_sources):
                 gyp_context.update(gyp_dir.sandbox_vars)
                 gyp_contexts.append(gyp_context)
                 self._file_count += len(gyp_context.all_paths)
             self._execution_time += time.time() - time_start
 
         for gyp_context in gyp_contexts:
-            context['DIRS'].append(mozpath.relpath(gyp_context.objdir, context.objdir))
             sandbox.subcontexts.append(gyp_context)
 
         for subcontext in sandbox.subcontexts:
             yield subcontext
 
         # Traverse into referenced files.
 
         # It's very tempting to use a set here. Unfortunately, the recursive