Bug 1499153 - Remove obsolete manifest check and NO_JS_MANIFEST r=gla…

…ndium Bug 1438688 made it so that XPT information is compiled directly into the binary instead of being shipped separately in interface files. This means that manifests are no longer necessary for JS components, which means the manifest check in emitter.py can be removed. That check is the only use of NO_JS_MANIFEST, so that can in turn be removed entirely. Differential Revision: https://phabricator.services.mozilla.com/D8885 --HG-- extra : moz-landing-system : lando
dothq · Oct 16, 2018 · 7988e5e · 7988e5e
1 parent d690035
commit 7988e5e
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 26 deletions.
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build b/browser/tools/mozscreenshots/mozscreenshots/extension/moz.build
@@ -7,7 +7,6 @@
 XPI_NAME = 'mozscreenshots'
 
 USE_EXTENSION_MANIFEST = True
-NO_JS_MANIFEST = True
 
 FINAL_TARGET_FILES += [
     'api.js',

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -113,7 +113,6 @@
     b'NO_DIST_INSTALL',
     b'NO_EXPAND_LIBS',
     b'NO_INTERFACES_MANIFEST',
-    b'NO_JS_MANIFEST',
     b'OS_LIBS',
     b'PARALLEL_DIRS',
     b'PREF_JS_EXPORTS',

diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozbuild/frontend/context.py
@@ -1928,17 +1928,6 @@ def aggregate(files):
         chrome.manifest.
         """),
 
-    'NO_JS_MANIFEST': (bool, bool,
-        """Explicitly disclaims responsibility for manifest listing in EXTRA_COMPONENTS.
-
-        Normally, if you have .js files listed in ``EXTRA_COMPONENTS`` or
-        ``EXTRA_PP_COMPONENTS``, you are expected to have a corresponding
-        .manifest file to go with those .js files.  Setting ``NO_JS_MANIFEST``
-        indicates that the relevant .manifest file and entries for those .js
-        files are elsehwere (jar.mn, for instance) and this state of affairs
-        is OK.
-        """),
-
     'GYP_DIRS': (StrictOrderingOnAppendListWithFlagsFactory({
             'variables': dict,
             'input': unicode,

diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -1037,7 +1037,6 @@ def emit_from_context(self, context):
             'RCINCLUDE',
             'WIN32_EXE_LDFLAGS',
             'USE_EXTENSION_MANIFEST',
-            'NO_JS_MANIFEST',
             'HAS_MISC_RULE',
         ]
         for v in varlist:
@@ -1300,16 +1299,6 @@ def emit_from_context(self, context):
 
             yield cls(context, all_files)
 
-        # Check for manifest declarations in EXTRA_{PP_,}COMPONENTS.
-        if any(e.endswith('.js') for e in components) and \
-                not any(e.endswith('.manifest') for e in components) and \
-                not context.get('NO_JS_MANIFEST', False):
-            raise SandboxValidationError('A .js component was specified in EXTRA_COMPONENTS '
-                                         'or EXTRA_PP_COMPONENTS without a matching '
-                                         '.manifest file.  See '
-                                         'https://developer.mozilla.org/en/XPCOM/XPCOM_changes_in_Gecko_2.0 .',
-                                         context);
-
         for c in components:
             if c.endswith('.manifest'):
                 yield ChromeManifestEntry(context, 'chrome.manifest',

diff --git a/testing/specialpowers/moz.build b/testing/specialpowers/moz.build
@@ -7,7 +7,6 @@
 XPI_NAME = 'specialpowers'
 
 USE_EXTENSION_MANIFEST = True
-NO_JS_MANIFEST = True
 
 FINAL_TARGET_FILES += [
     'api.js',

diff --git a/tools/quitter/moz.build b/tools/quitter/moz.build
@@ -9,7 +9,6 @@ XPI_NAME = 'quitter'
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
-NO_JS_MANIFEST = True
 
 FINAL_TARGET_FILES += [
     'bootstrap.js',