Bug 1377911 - Move the override chrome entries from language manifests to product manifests. r?pike draft
authorZibi Braniecki <zbraniecki@mozilla.com>
Thu, 03 Aug 2017 20:18:08 -0700
changeset 642174 6f37f8acedcf0a34d2a384a650f546b2286b305f
parent 642173 fde1450a4368d04e97174e2eb00fb48901179857
child 724924 af30a50c42d53a60b9c3f312e144c1788ce0cc71
push id72669
push userbmo:gandalf@aviary.pl
push dateMon, 07 Aug 2017 20:04:08 +0000
reviewerspike
bugs1377911
milestone57.0a1
Bug 1377911 - Move the override chrome entries from language manifests to product manifests. r?pike In order to simplify the language pack manifests and tighten the security around them, we'd like to move the overrides for language resources to product manifest. MozReview-Commit-ID: J8Y7epUWcxD
browser/base/jar.mn
browser/locales/jar.mn
mobile/android/chrome/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -170,8 +170,13 @@ browser.jar:
 # the following files are browser-specific overrides
 *       content/browser/license.html                  (/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
         content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
         content/browser/blockedSite.xhtml               (content/blockedSite.xhtml)
 % overlay chrome://browser/content/browser.xul chrome://browser/content/report-phishing-overlay.xul
 
 % override chrome://global/content/netError.xhtml chrome://browser/content/aboutNetError.xhtml
+
+# L10n resource overrides.
+% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -113,20 +113,16 @@
     locale/browser/searchplugins/images/yahoo.ico      (searchplugins/images/yahoo.ico)
     locale/browser/searchplugins/images/yandex-en.ico  (searchplugins/images/yandex-en.ico)
     locale/browser/searchplugins/images/yandex-ru.ico  (searchplugins/images/yandex-ru.ico)
 % locale browser-region @AB_CD@ %locale/browser-region/
     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
 # the following files are browser-specific overrides
     locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
     locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
-    locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
-% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
-% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
-% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
 % locale pdf.js @AB_CD@ %locale/pdfviewer/
     locale/pdfviewer/viewer.properties             (%pdfviewer/viewer.properties)
     locale/pdfviewer/chrome.properties             (%pdfviewer/chrome.properties)
 
 #ifdef XPI_NAME
 # Bug 1240628, restructure how l10n repacks work with feature addons
 # This is hacky, but ensures the chrome.manifest chain is complete
 [.] chrome.jar:
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -61,8 +61,14 @@ chrome.jar:
   content/WebcompatReporter.js         (content/WebcompatReporter.js)
 #endif
 
 % content branding %content/branding/
 
 % override chrome://global/content/config.xul chrome://browser/content/config.xhtml
 % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml
 % override chrome://mozapps/content/extensions/extensions.xul chrome://browser/content/aboutAddons.xhtml
+
+
+# L10n resource overrides.
+% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
+% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
+% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd