# HG changeset patch
# User Kartikaya Gupta <kgupta@mozilla.com>
# Date 1536327280 14400
# Node ID d547743a6b807e38c4a4d442230136bf1d3257e2
# Parent  f8a8bc1f8bc14f49086a10afcb99d7aa1182a372
Bug 1440879 - Ensure all the stl_wrappers end up in the generated-files tarball. r=froydnj

diff --git a/config/moz.build b/config/moz.build
--- a/config/moz.build
+++ b/config/moz.build
@@ -42,16 +42,20 @@ include('stl-headers.mozbuild')
 if CONFIG['WRAP_STL_INCLUDES']:
     stl_compiler = None
     if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
         stl_compiler = 'gcc'
     elif CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
         stl_compiler = 'msvc'
 
     if stl_compiler:
+        # Note that the 'stl_wrappers' folder is known to the build system as
+        # containing generated files; if this is changed here then the code in
+        # GeneratedFile.__init__ in python/mozbuild/mozbuild/frontend/data.py
+        # might need to be updated accordingly as well.
         template_file = SRCDIR + '/%s-stl-wrapper.template.h' % stl_compiler
         output_dir = '../dist/stl_wrappers'
         # We have to use a sentinel file as the first file because the
         # file_generate action will create it for us, but we want to create all
         # the files in gen_wrappers()
         outputs = tuple(['stl.sentinel'] + ['%s/%s' % (output_dir, h) for h in stl_headers])
         GENERATED_FILES += [outputs]
         stl = GENERATED_FILES[outputs]
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
@@ -1165,19 +1165,18 @@ class GeneratedFile(ContextDerived):
 
         suffixes = (
             '.c',
             '.cpp',
             '.h',
             '.inc',
             '.py',
             '.rs',
-            'new', # 'new' is an output from make-stl-wrappers.py
         )
-        self.required_for_compile = [f for f in self.outputs if f.endswith(suffixes)]
+        self.required_for_compile = [f for f in self.outputs if f.endswith(suffixes) or 'stl_wrappers/' in f]
 
 
 class ChromeManifestEntry(ContextDerived):
     """Represents a chrome.manifest entry."""
 
     __slots__ = (
         'path',
         'entry',