Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium

Every directory with a jar.mn now has JAR_MANIFESTS defined in its moz.build file. We also removed the may_skip special consideration of jar.mn files because this information is now available during tier traversal by the reader courtesy of the variables being present in moz.build files. --HG-- extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98 extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2024-11-24 05:11:16 +00:00 · 2013-12-10 16:18:11 +09:00 · 2013-12-10 16:18:11 +09:00 · e396fc159d
commit e396fc159d
parent 40438af67c
135 changed files with 215 additions and 11 deletions
--- a/accessible/src/jsat/moz.build
+++ b/accessible/src/jsat/moz.build
@ -16,3 +16,5 @@ EXTRA_JS_MODULES += [
    'TraversalRules.jsm',
    'Utils.jsm'
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/branding/official/content/moz.build
+++ b/b2g/branding/official/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/branding/official/locales/moz.build
+++ b/b2g/branding/official/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/branding/unofficial/content/moz.build
+++ b/b2g/branding/unofficial/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/branding/unofficial/locales/moz.build
+++ b/b2g/branding/unofficial/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/chrome/moz.build
+++ b/b2g/chrome/moz.build
@ -7,3 +7,5 @@
 DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
 DEFINES['PACKAGE'] = 'browser'
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/b2g/locales/moz.build
+++ b/b2g/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@ -34,3 +34,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
    DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/aurora/content/moz.build
+++ b/browser/branding/aurora/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/aurora/locales/moz.build
+++ b/browser/branding/aurora/locales/moz.build
@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/nightly/content/moz.build
+++ b/browser/branding/nightly/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/nightly/locales/moz.build
+++ b/browser/branding/nightly/locales/moz.build
@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/official/content/moz.build
+++ b/browser/branding/official/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/official/locales/moz.build
+++ b/browser/branding/official/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/unofficial/content/moz.build
+++ b/browser/branding/unofficial/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/branding/unofficial/locales/moz.build
+++ b/browser/branding/unofficial/locales/moz.build
@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/certerror/moz.build
+++ b/browser/components/certerror/moz.build
@ -7,3 +7,5 @@
 BROWSER_CHROME_MANIFESTS += [
    'test/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/customizableui/content/moz.build
+++ b/browser/components/customizableui/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/downloads/moz.build
+++ b/browser/components/downloads/moz.build
@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [
 BROWSER_CHROME_MANIFESTS += [
    'test/browser/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/feeds/moz.build
+++ b/browser/components/feeds/moz.build
@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [
 MOCHITEST_MANIFESTS += [
    'test/mochitest.ini'
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/migration/moz.build
+++ b/browser/components/migration/moz.build
@ -9,3 +9,5 @@ DIRS += ['public', 'src']
 XPCSHELL_TESTS_MANIFESTS += [
    'tests/unit/xpcshell.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/places/moz.build
+++ b/browser/components/places/moz.build
@ -17,3 +17,5 @@ MOCHITEST_CHROME_MANIFESTS += [
 BROWSER_CHROME_MANIFESTS += [
    'tests/browser/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/preferences/in-content/moz.build
+++ b/browser/components/preferences/in-content/moz.build
@ -9,3 +9,5 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/preferences/moz.build
+++ b/browser/components/preferences/moz.build
@ -16,3 +16,5 @@ for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):

 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/privatebrowsing/moz.build
+++ b/browser/components/privatebrowsing/moz.build
@ -7,3 +7,5 @@
 BROWSER_CHROME_MANIFESTS += [
    'test/browser/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/search/moz.build
+++ b/browser/components/search/moz.build
@ -7,3 +7,5 @@
 BROWSER_CHROME_MANIFESTS += [
    'test/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/sessionstore/moz.build
+++ b/browser/components/sessionstore/moz.build
@ -20,3 +20,5 @@ XPCSHELL_TESTS_MANIFESTS += [
 BROWSER_CHROME_MANIFESTS += [
    'test/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
@ -13,3 +13,5 @@ XPCSHELL_TESTS_MANIFESTS += [
 BROWSER_CHROME_MANIFESTS += [
    'test/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/components/tabview/moz.build
+++ b/browser/components/tabview/moz.build
@ -10,3 +10,5 @@ JS_MODULES_PATH  = 'modules/tabview'
 BROWSER_CHROME_MANIFESTS += [
    'test/browser.ini',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/devtools/moz.build
+++ b/browser/devtools/moz.build
@ -30,3 +30,5 @@ EXTRA_COMPONENTS += [
    'devtools-clhandler.js',
    'devtools-clhandler.manifest',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/locales/moz.build
+++ b/browser/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/metro/base/moz.build
+++ b/browser/metro/base/moz.build
@ -12,3 +12,5 @@ DIST_SUBDIR = 'metro'
 DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
 DEFINES['PACKAGE'] = 'browser'
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/browser/metro/locales/moz.build
+++ b/browser/metro/locales/moz.build
@ -7,3 +7,4 @@
 # Process desktop related resource we reuse here.
 DIRS += ['import']

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/metro/theme/moz.build
+++ b/browser/metro/theme/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/linux/communicator/moz.build
+++ b/browser/themes/linux/communicator/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/linux/moz.build
+++ b/browser/themes/linux/moz.build
@ -6,3 +6,4 @@

 DIRS += ['communicator']

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/osx/communicator/moz.build
+++ b/browser/themes/osx/communicator/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/osx/moz.build
+++ b/browser/themes/osx/moz.build
@ -6,3 +6,4 @@

 DIRS += ['communicator']

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/windows/communicator/moz.build
+++ b/browser/themes/windows/communicator/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/browser/themes/windows/moz.build
+++ b/browser/themes/windows/moz.build
@ -6,3 +6,4 @@

 DIRS += ['communicator']

+JAR_MANIFESTS += ['jar.mn']
--- a/config/config.mk
+++ b/config/config.mk
@ -51,6 +51,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  HOST_PROGRAM \
  HOST_SIMPLE_PROGRAMS \
  IS_COMPONENT \
+  JAR_MANIFEST \
  JAVA_JAR_TARGETS \
  JS_MODULES_PATH \
  LIBRARY_NAME \
--- a/config/rules.mk
+++ b/config/rules.mk
@ -1284,8 +1284,6 @@ endif # SDK_BINARY
 ################################################################################
 # CHROME PACKAGING

-JAR_MANIFEST := $(srcdir)/jar.mn
-
 chrome::
 	$(MAKE) realchrome
 	$(LOOP_OVER_PARALLEL_DIRS)
@ -1294,7 +1292,7 @@ chrome::

 $(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)

-ifneq (,$(wildcard $(JAR_MANIFEST)))
+ifneq (,$(JAR_MANIFEST))
 ifndef NO_DIST_INSTALL

 ifdef XPI_NAME
@ -1321,6 +1319,13 @@ libs realchrome:: $(FINAL_TARGET)/chrome
 	  $(JAR_MANIFEST))

 endif
+
+# This is a temporary check to ensure patches relying on the old behavior
+# of silently picking up jar.mn files continue to work.
+else # No JAR_MANIFEST
+ifneq (,$(wildcard $(srcdir)/jar.mn))
+$(error $(srcdir) contains a jar.mn file but this file is not declared in a JAR_MANIFESTS variable in a moz.build file)
+endif
 endif

 ifneq ($(DIST_FILES),)
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@ -5,7 +5,9 @@

 LOCALE_SRCDIR = $(srcdir)/l10n

+EXTERNALLY_MANAGED_MAKE_FILE := 1
 STANDALONE_MAKEFILE := 1
+JAR_MANIFEST := $(srcdir)/jar.mn

 include $(topsrcdir)/config/config.mk

--- a/config/tests/src-simple/moz.build
+++ b/config/tests/src-simple/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xbl/builtin/android/moz.build
+++ b/content/xbl/builtin/android/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xbl/builtin/emacs/moz.build
+++ b/content/xbl/builtin/emacs/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xbl/builtin/mac/moz.build
+++ b/content/xbl/builtin/mac/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xbl/builtin/unix/moz.build
+++ b/content/xbl/builtin/unix/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xbl/builtin/win/moz.build
+++ b/content/xbl/builtin/win/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xml/document/resources/moz.build
+++ b/content/xml/document/resources/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/content/xslt/tests/buster/moz.build
+++ b/content/xslt/tests/buster/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/docshell/resources/content/moz.build
+++ b/docshell/resources/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/dom/inputmethod/moz.build
+++ b/dom/inputmethod/moz.build
@ -18,3 +18,5 @@ EXTRA_COMPONENTS += [
 EXTRA_JS_MODULES += [
    'Keyboard.jsm',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@ -116,3 +116,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gonk', 'qt'):
 for var in ('MOZ_PERMISSIONS', 'MOZ_CHILD_PERMISSIONS'):
    if CONFIG[var]:
        DEFINES[var] = True
+
+JAR_MANIFESTS += ['jar.mn']
--- a/dom/locales/moz.build
+++ b/dom/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/dom/src/moz.build
+++ b/dom/src/moz.build
@ -13,3 +13,5 @@ DIRS += [
    'geolocation',
    'notification',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@ -233,3 +233,5 @@ LOCAL_INCLUDES += [
 ]

 FINAL_LIBRARY = 'xul'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@ -51,6 +51,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  HOST_PROGRAM \
  HOST_SIMPLE_PROGRAMS \
  IS_COMPONENT \
+  JAR_MANIFEST \
  JAVA_JAR_TARGETS \
  JS_MODULES_PATH \
  LIBRARY_NAME \
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@ -1284,8 +1284,6 @@ endif # SDK_BINARY
 ################################################################################
 # CHROME PACKAGING

-JAR_MANIFEST := $(srcdir)/jar.mn
-
 chrome::
 	$(MAKE) realchrome
 	$(LOOP_OVER_PARALLEL_DIRS)
@ -1294,7 +1292,7 @@ chrome::

 $(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)

-ifneq (,$(wildcard $(JAR_MANIFEST)))
+ifneq (,$(JAR_MANIFEST))
 ifndef NO_DIST_INSTALL

 ifdef XPI_NAME
@ -1321,6 +1319,13 @@ libs realchrome:: $(FINAL_TARGET)/chrome
 	  $(JAR_MANIFEST))

 endif
+
+# This is a temporary check to ensure patches relying on the old behavior
+# of silently picking up jar.mn files continue to work.
+else # No JAR_MANIFEST
+ifneq (,$(wildcard $(srcdir)/jar.mn))
+$(error $(srcdir) contains a jar.mn file but this file is not declared in a JAR_MANIFESTS variable in a moz.build file)
+endif
 endif

 ifneq ($(DIST_FILES),)
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@ -121,3 +121,5 @@ LOCAL_INCLUDES += [
    '../tables',
    '../xul',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@ -31,3 +31,5 @@ LOCAL_INCLUDES += [
    '/layout/generic',
    '/layout/xul',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@ -46,3 +46,5 @@ if CONFIG['ENABLE_TESTS']:
    PARALLEL_DIRS += [
        'tests',
    ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@ -154,3 +154,5 @@ LOCAL_INCLUDES += [
    '../xul',
    '/dom/base',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/layout/style/xbl-marquee/moz.build
+++ b/layout/style/xbl-marquee/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/layout/tools/layout-debug/ui/moz.build
+++ b/layout/tools/layout-debug/ui/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/layout/tools/recording/moz.build
+++ b/layout/tools/recording/moz.build
@ -8,3 +8,5 @@ EXTRA_COMPONENTS += [
    'recording-cmdline.js',
    'recording-cmdline.manifest',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/layout/tools/reftest/moz.build
+++ b/layout/tools/reftest/moz.build
@ -8,3 +8,4 @@ EXTRA_COMPONENTS += [
    'reftest-cmdline.js',
 ]

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/aurora/content/moz.build
+++ b/mobile/android/branding/aurora/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/aurora/locales/moz.build
+++ b/mobile/android/branding/aurora/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/beta/content/moz.build
+++ b/mobile/android/branding/beta/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/beta/locales/moz.build
+++ b/mobile/android/branding/beta/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/nightly/content/moz.build
+++ b/mobile/android/branding/nightly/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/nightly/locales/moz.build
+++ b/mobile/android/branding/nightly/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/official/content/moz.build
+++ b/mobile/android/branding/official/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/official/locales/moz.build
+++ b/mobile/android/branding/official/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/unofficial/content/moz.build
+++ b/mobile/android/branding/unofficial/content/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/branding/unofficial/locales/moz.build
+++ b/mobile/android/branding/unofficial/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/chrome/moz.build
+++ b/mobile/android/chrome/moz.build
@ -8,3 +8,5 @@ DEFINES['AB_CD'] = CONFIG['MOZ_UI_LOCALE']
 DEFINES['PACKAGE'] = 'browser'
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/locales/moz.build
+++ b/mobile/android/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/android/themes/core/moz.build
+++ b/mobile/android/themes/core/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/mobile/locales/moz.build
+++ b/mobile/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/netwerk/locales/moz.build
+++ b/netwerk/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/netwerk/test/httpserver/moz.build
+++ b/netwerk/test/httpserver/moz.build
@ -16,3 +16,4 @@ EXTRA_COMPONENTS += [
    'httpd.js',
 ]

+JAR_MANIFESTS += ['jar.mn']
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@ -687,11 +687,6 @@ class RecursiveMakeBackend(CommonBackend):
                    self.log(logging.DEBUG, 'stub_makefile',
                        {'path': makefile}, 'Creating stub Makefile: {path}')

-                # Can't skip directories with a jar.mn for the 'libs' tier.
-                if bf.relobjdir in self._may_skip['libs'] and \
-                        os.path.exists(mozpath.join(srcdir, 'jar.mn')):
-                    self._may_skip['libs'].remove(bf.relobjdir)
-
                obj = self.Substitution()
                obj.output_path = makefile
                obj.input_path = makefile_in
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@ -390,6 +390,17 @@ class TreeMetadataEmitter(LoggingMixin):
        for path in jar_manifests:
            yield JARManifest(sandbox, mozpath.join(sandbox['SRCDIR'], path))

+        # Temporary test to look for jar.mn files that creep in without using
+        # the new declaration. Before, we didn't require jar.mn files to
+        # declared anywhere (they were discovered). This will detect people
+        # relying on the old behavior.
+        if os.path.exists(os.path.join(sandbox['SRCDIR'], 'jar.mn')):
+            if 'jar.mn' not in jar_manifests:
+                raise SandboxValidationError('A jar.mn exists in %s but it '
+                    'is not referenced in the corresponding moz.build file. '
+                    'Please define JAR_MANIFESTS in the moz.build file.' %
+                    sandbox['SRCDIR'])
+
        for name, jar in sandbox.get('JAVA_JAR_TARGETS', {}).items():
            yield SandboxWrapped(sandbox, jar)

--- a/security/manager/locales/moz.build
+++ b/security/manager/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/security/manager/pki/resources/moz.build
+++ b/security/manager/pki/resources/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/services/sync/locales/moz.build
+++ b/services/sync/locales/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/testing/marionette/atoms/moz.build
+++ b/testing/marionette/atoms/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/testing/marionette/moz.build
+++ b/testing/marionette/moz.build
@ -8,3 +8,5 @@ DIRS += ['components', 'atoms']

 if CONFIG['ENABLE_TESTS']:
    DEFINES['ENABLE_TESTS'] = True
+
+JAR_MANIFESTS += ['jar.mn']
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@ -17,3 +17,5 @@ if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
    DIRS += ['roboextender']

 XPI_NAME = 'mochijar'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/testing/specialpowers/moz.build
+++ b/testing/specialpowers/moz.build
@ -9,3 +9,5 @@ EXTRA_COMPONENTS += [
 ]

 XPI_NAME = 'specialpowers'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/aboutmemory/moz.build
+++ b/toolkit/components/aboutmemory/moz.build
@ -5,3 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 TEST_DIRS += ['tests']
+
+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@ -20,3 +20,5 @@ UNIFIED_SOURCES += [
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'toolkitcomps'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/apppicker/moz.build
+++ b/toolkit/components/apppicker/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/console/moz.build
+++ b/toolkit/components/console/moz.build
@ -10,3 +10,5 @@ EXTRA_COMPONENTS += [
    'jsconsole-clhandler.js',
    'jsconsole-clhandler.manifest',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/cookie/moz.build
+++ b/toolkit/components/cookie/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@ -23,3 +23,5 @@ if CONFIG['MOZ_XUL'] and \
            'test',
        ]
        FINAL_LIBRARY = 'xul'
+
+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/help/moz.build
+++ b/toolkit/components/help/moz.build
@ -4,3 +4,4 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/passwordmgr/moz.build
+++ b/toolkit/components/passwordmgr/moz.build
@ -33,3 +33,5 @@ EXTRA_JS_MODULES += [
    'InsecurePasswordUtils.jsm',
    'LoginManagerContent.jsm',
 ]
+
+JAR_MANIFESTS += ['jar.mn']
--- a/Show More
+++ b/Show More