Bug 1241022 - Remove code handling affected_tiers. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 20 Jan 2016 15:59:40 +0900
changeset 303101 d2692a330fb015047f110473a19b669ce1269826
parent 303100 f10de1a56091db7da1cef0b57e3799c43c8256c3
child 303102 7b9c54abd2fe8932e19ad57e3b334684a8c7f77d
push id8978
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 14:05:32 +0000
treeherdermozilla-aurora@b9a803752a2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1241022
milestone46.0a1
Bug 1241022 - Remove code handling affected_tiers. r=gps
python/mozbuild/mozbuild/backend/recursivemake.py
python/mozbuild/mozbuild/frontend/context.py
python/mozbuild/mozbuild/frontend/emitter.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -916,21 +916,16 @@ class RecursiveMakeBackend(CommonBackend
                 relativize(backend_file.objdir, obj.dirs)))
             self._traversal.add(backend_file.relobjdir,
                 dirs=relativize(self.environment.topobjdir, obj.dirs))
 
         # The directory needs to be registered whether subdirectories have been
         # registered or not.
         self._traversal.add(backend_file.relobjdir)
 
-        affected_tiers = set(obj.affected_tiers)
-
-        for tier in set(self._no_skip.keys()) & affected_tiers:
-            self._no_skip[tier].add(backend_file.relobjdir)
-
     def _process_defines(self, obj, backend_file, which='DEFINES'):
         """Output the DEFINES rules to the given backend file."""
         defines = list(obj.get_defines())
         if defines:
             defines = ' '.join(shell_quote(d) for d in defines)
             backend_file.write_once('%s += %s\n' % (which, defines))
 
     def _process_test_harness_files(self, obj, backend_file):
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -230,23 +230,16 @@ class Context(KeyedDefaultDict):
             update[key] = (value, stored_type)
         for key, (value, stored_type) in update.items():
             if not isinstance(value, stored_type):
                 update[key] = stored_type(value)
             else:
                 update[key] = value
         KeyedDefaultDict.update(self, update)
 
-    def get_affected_tiers(self):
-        """Returns the list of tiers affected by the variables set in the
-        context.
-        """
-        tiers = (VARIABLES[key][3] for key in self if key in VARIABLES)
-        return set(tier for tier in tiers if tier)
-
 
 class TemplateContext(Context):
     def __init__(self, template=None, allowed_variables={}, config=None):
         self.template = template
         super(TemplateContext, self).__init__(allowed_variables, config)
 
     def _validate(self, key, value):
         return Context._validate(self, key, value, True)
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1304,16 +1304,15 @@ class TreeMetadataEmitter(LoggingMixin):
             if 'jar.mn' not in jar_manifests:
                 raise SandboxValidationError('A jar.mn exists but it '
                     'is not referenced in the moz.build file. '
                     'Please define JAR_MANIFESTS.', context)
 
     def _emit_directory_traversal_from_context(self, context):
         o = DirectoryTraversal(context)
         o.dirs = context.get('DIRS', [])
-        o.affected_tiers = context.get_affected_tiers()
 
         # Some paths have a subconfigure, yet also have a moz.build. Those
         # shouldn't end up in self._external_paths.
         if o.objdir:
             self._external_paths -= { o.relobjdir }
 
         yield o