rebase

bug1240930-253/mozilla/1443204-1only-60a1.patch

@@ -1,4 +1,3 @@
-
 # HG changeset patch
 # User Nick Alexander <nalexander@mozilla.com>
 # Date 1520376784 28800
@@ -30,12 +29,12 @@ diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild
      ComputedFlags,
      ConfigFileSubstitution,
      ContextDerived,
-     ContextWrapped,
      Defines,
+     DirectoryTraversal,
 diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
 --- a/python/mozbuild/mozbuild/frontend/data.py
 +++ b/python/mozbuild/mozbuild/frontend/data.py
-@@ -1128,69 +1128,16 @@ class GeneratedFile(ContextDerived):
+@@ -1003,69 +1003,16 @@ class GeneratedFile(ContextDerived):
              '.inc',
              '.py',
              '.rs',
@@ -121,15 +120,15 @@ diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozb
 -    AndroidExtraPackages,
 -    AndroidExtraResDirs,
 -    AndroidResDirs,
-     BaseRustProgram,
      BaseSources,
      ChromeManifestEntry,
      ComputedFlags,
      ConfigFileSubstitution,
-     ContextWrapped,
      Defines,
      DirectoryTraversal,
-@@ -1375,28 +1371,29 @@ class TreeMetadataEmitter(LoggingMixin):
+     Exports,
+     FinalTargetFiles,
+@@ -1334,28 +1330,29 @@ class TreeMetadataEmitter(LoggingMixin):
                      if not os.path.exists(script):
                          raise SandboxValidationError(
                              'Script for generating %s does not exist: %s'
@@ -189,4 +188,3 @@ diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/moz
      Exports,
      FinalTargetPreprocessedFiles,
      GeneratedFile,
-