Bug 780562 - Stop relying on the "platform" chrome flag for global-platform. r?bsmedberg
The "platform" chrome flag requires an irrelevant "content" chrome
manifest entry, while it's only used for locales. It only has exactly
one use, which can actually be replaced by uses of the "os" flag.
Note, we're doing something similar with the "os" flag for skins in
e.g. browser/extensions/pocket/jar.mn.
Unfortunately, for determinism reasons, the chrome manifest entries from
jar.mn are sorted (per
bug 982075), so keeping global-platform/unix
would leave it appearing after /mac, and would override it on mac
because of the lack of "os" flag on the /unix entry (we can't put "os"
flags on that entry because we can't do something like os!=Darwin &&
os!=WINNT). So we move it to /gtk such that it always comes before /mac.
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -93,21 +93,21 @@ var whitelist = new Set([
// The l10n build system can't package string files only for some platforms.
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/accessible.properties",
platforms: ["linux", "win"]},
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/intl.properties",
platforms: ["linux", "win"]},
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/mac/platformKeys.properties",
platforms: ["linux", "win"]},
- {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/accessible.properties",
+ {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties",
platforms: ["macosx", "win"]},
- {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/intl.properties",
+ {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/intl.properties",
platforms: ["macosx", "win"]},
- {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties",
+ {file: "resource://gre/chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties",
platforms: ["macosx", "win"]},
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/accessible.properties",
platforms: ["linux", "macosx"]},
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/intl.properties",
platforms: ["linux", "macosx"]},
{file: "resource://gre/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties",
platforms: ["linux", "macosx"]},
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -188,19 +188,19 @@ chrome/en-US/locale/en-US/browser/overri
chrome/en-US/locale/en-US/browser/overrides/global/mozilla.dtd
chrome/en-US/locale/en-US/browser/overrides/intl.css
chrome/en-US/locale/en-US/browser/overrides/intl.properties
chrome/en-US/locale/en-US/browser/overrides/passwordmgr.properties
chrome/en-US/locale/en-US/browser/overrides/plugins.properties
chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd
chrome/en-US/locale/en-US/browser/overrides/search/search.properties
chrome/en-US/locale/en-US/global-platform/mac/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/accessible.properties
-chrome/en-US/locale/en-US/global-platform/unix/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties
+chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties
+chrome/en-US/locale/en-US/global-platform/gtk/intl.properties
+chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties
chrome/en-US/locale/en-US/global-platform/win/accessible.properties
chrome/en-US/locale/en-US/global-platform/win/intl.properties
chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
chrome/en-US/locale/en-US/global/AccessFu.properties
chrome/en-US/locale/en-US/global/about.dtd
chrome/en-US/locale/en-US/global/aboutAbout.dtd
chrome/en-US/locale/en-US/global/aboutReader.properties
chrome/en-US/locale/en-US/global/aboutRights.dtd
--- a/dom/locales/jar.mn
+++ b/dom/locales/jar.mn
@@ -25,11 +25,11 @@
locale/@AB_CD@/global/layout/xmlparser.properties (%chrome/layout/xmlparser.properties)
locale/@AB_CD@/global/layout/HtmlForm.properties (%chrome/layout/HtmlForm.properties)
locale/@AB_CD@/global/security/caps.properties (%chrome/security/caps.properties)
locale/@AB_CD@/global/security/csp.properties (%chrome/security/csp.properties)
locale/@AB_CD@/global/security/security.properties (%chrome/security/security.properties)
locale/@AB_CD@/global/xml/prettyprint.dtd (%chrome/xml/prettyprint.dtd)
locale/@AB_CD@/global-platform/win/accessible.properties (%chrome/accessibility/win/accessible.properties)
locale/@AB_CD@/global-platform/mac/accessible.properties (%chrome/accessibility/mac/accessible.properties)
- locale/@AB_CD@/global-platform/unix/accessible.properties (%chrome/accessibility/unix/accessible.properties)
+ locale/@AB_CD@/global-platform/gtk/accessible.properties (%chrome/accessibility/unix/accessible.properties)
locale/@AB_CD@/global/AccessFu.properties (%chrome/accessibility/AccessFu.properties)
locale/@AB_CD@/global/mathml/mathml.properties (%chrome/mathml/mathml.properties)
--- a/mobile/android/installer/allowed-dupes.mn
+++ b/mobile/android/installer/allowed-dupes.mn
@@ -79,19 +79,19 @@ chrome/en-US/locale/en-US/browser/overri
chrome/en-US/locale/en-US/browser/overrides/global/aboutTelemetry.properties
chrome/en-US/locale/en-US/browser/overrides/global/aboutWebrtc.properties
chrome/en-US/locale/en-US/browser/overrides/intl.properties
chrome/en-US/locale/en-US/browser/overrides/passwordmgr.properties
chrome/en-US/locale/en-US/browser/overrides/plugins.properties
chrome/en-US/locale/en-US/browser/overrides/plugins/pluginproblem.dtd
chrome/en-US/locale/en-US/browser/overrides/search/search.properties
chrome/en-US/locale/en-US/global-platform/mac/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/accessible.properties
-chrome/en-US/locale/en-US/global-platform/unix/intl.properties
-chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properties
+chrome/en-US/locale/en-US/global-platform/gtk/accessible.properties
+chrome/en-US/locale/en-US/global-platform/gtk/intl.properties
+chrome/en-US/locale/en-US/global-platform/gtk/platformKeys.properties
chrome/en-US/locale/en-US/global-platform/win/accessible.properties
chrome/en-US/locale/en-US/global-platform/win/intl.properties
chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
chrome/en-US/locale/en-US/global/AccessFu.properties
chrome/en-US/locale/en-US/global/about.dtd
chrome/en-US/locale/en-US/global/aboutAbout.dtd
chrome/en-US/locale/en-US/global/aboutReader.properties
chrome/en-US/locale/en-US/global/aboutRights.dtd
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -1,11 +1,10 @@
toolkit.jar:
% content global %content/global/ contentaccessible=yes
-% content global-platform %content/global-platform/ platform
* content/global/license.html
content/global/XPCNativeWrapper.js
content/global/minimal-xul.css
* content/global/xul.css
content/global/textbox.css
content/global/menulist.css
content/global/autocomplete.css
content/global/about.js--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -87,22 +87,24 @@
locale/@AB_CD@/global/textcontext.dtd (%chrome/global/textcontext.dtd)
locale/@AB_CD@/global/videocontrols.dtd (%chrome/global/videocontrols.dtd)
locale/@AB_CD@/global/viewSource.dtd (%chrome/global/viewSource.dtd)
locale/@AB_CD@/global/viewSource.properties (%chrome/global/viewSource.properties)
locale/@AB_CD@/global/wizard.dtd (%chrome/global/wizard.dtd)
locale/@AB_CD@/global/wizard.properties (%chrome/global/wizard.properties)
locale/@AB_CD@/global/crashes.dtd (%crashreporter/crashes.dtd)
locale/@AB_CD@/global/crashes.properties (%crashreporter/crashes.properties)
-% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/
+% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/
+% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/mac/ os=Darwin
+% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/win/ os=WINNT
locale/@AB_CD@/global-platform/mac/platformKeys.properties (%chrome/global-platform/mac/platformKeys.properties)
- locale/@AB_CD@/global-platform/unix/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties)
+ locale/@AB_CD@/global-platform/gtk/platformKeys.properties (%chrome/global-platform/unix/platformKeys.properties)
locale/@AB_CD@/global-platform/win/platformKeys.properties (%chrome/global-platform/win/platformKeys.properties)
locale/@AB_CD@/global-platform/mac/intl.properties (%chrome/global-platform/mac/intl.properties)
- locale/@AB_CD@/global-platform/unix/intl.properties (%chrome/global-platform/unix/intl.properties)
+ locale/@AB_CD@/global-platform/gtk/intl.properties (%chrome/global-platform/unix/intl.properties)
locale/@AB_CD@/global-platform/win/intl.properties (%chrome/global-platform/win/intl.properties)
% locale mozapps @AB_CD@ %locale/@AB_CD@/mozapps/
locale/@AB_CD@/mozapps/downloads/unknownContentType.properties (%chrome/mozapps/downloads/unknownContentType.properties)
locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd (%chrome/mozapps/downloads/unknownContentType.dtd)
locale/@AB_CD@/mozapps/downloads/settingsChange.dtd (%chrome/mozapps/downloads/settingsChange.dtd)
locale/@AB_CD@/mozapps/downloads/downloads.properties (%chrome/mozapps/downloads/downloads.properties)
locale/@AB_CD@/mozapps/extensions/extensions.dtd (%chrome/mozapps/extensions/extensions.dtd)
#ifndef MOZ_FENNEC
