Bug 1308982 - Stop adding gyp directories to the DIRS make variable. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 21 Nov 2016 14:57:57 -0800
changeset 442174 7c671405b2e846fbaeb68be31710a2c5188e2ee8
parent 442173 f69af759bd0d0213b9f5c7e1c6a1da2fb5c106a2
child 442175 48cb3e469aa5d8a6188baa5cfe14762601ef1bd4
child 442176 9af82b134dd15a242c50fcaaa4b6042b3680045e
push id36611
push userbmo:cmanchester@mozilla.com
push dateMon, 21 Nov 2016 22:58:14 +0000
bugs1308982
milestone53.0a1
Bug 1308982 - Stop adding gyp directories to the DIRS make variable. 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