Bug 1308982 - Stop adding gyp directories to the DIRS make variable. draft
authorChris Manchester <cmanchester@mozilla.com>
Thu, 01 Dec 2016 14:28:55 -0800
changeset 446796 8a2e902f4290bea82b284091725633aaa00e1801
parent 446795 7bd0f6946b7f7b81bc91931e035305baec989e1e
child 446797 02657543b91ec6a4e8cd7fd1ad285da0a58b6863
push id37888
push userbmo:cmanchester@mozilla.com
push dateThu, 01 Dec 2016 22:29:10 +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