Bug 1308982 - Stop adding gyp directories to the DIRS make variable. r=gps
☠☠ backed out by 02bd7db82457 ☠ ☠
authorChris Manchester <cmanchester@mozilla.com>
Thu, 01 Dec 2016 14:28:55 -0800
changeset 325146 bbb8642886b817f5cdd643368cde17469e53124c
parent 325145 9e66e4d7e87d025612472e2549d720631be9e67b
child 325147 09e996bdc9e4b356a673b5737c71e2793646d5e7
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersgps
bugs1308982
milestone53.0a1
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