Bug 1365419 - Use the new os=LikeUnix flag instead of relying on overrides. r?bsmedberg
Since it wasn't possible to have specific manifest entries for !Darwin
!WINNT !Android, a few places in the tree use the following pattern:
entry-for-unix
entry-for-osx os=Darwin
entry-for-windows os=WINNT
This works because subsequent manifest entries with more specific flags
override previous manifest entries.
Incidentally, this led to problems such as the one mentioned in
changeset c94e87a18096.
Now that there is a flag for !Darwin !WINNT !Android, we can use it
instead.
--- a/browser/extensions/flyweb/jar.mn
+++ b/browser/extensions/flyweb/jar.mn
@@ -1,10 +1,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
[features/flyweb@mozilla.org] chrome.jar:
-% skin flyweb classic/1.0 %skin/linux/
+% skin flyweb classic/1.0 %skin/linux/ os=LikeUnix
% skin flyweb classic/1.0 %skin/osx/ os=Darwin
% skin flyweb classic/1.0 %skin/windows/ os=WINNT
% skin flyweb-shared classic/1.0 %skin/shared/
skin/ (skin/*)
--- a/browser/extensions/formautofill/jar.mn
+++ b/browser/extensions/formautofill/jar.mn
@@ -4,13 +4,13 @@
[features/formautofill@mozilla.org] chrome.jar:
% resource formautofill %res/
res/ (*.jsm)
% content formautofill %content/
content/ (content/*)
-% skin formautofill classic/1.0 %skin/linux/
+% skin formautofill classic/1.0 %skin/linux/ os=LikeUnix
% skin formautofill classic/1.0 %skin/osx/ os=Darwin
% skin formautofill classic/1.0 %skin/windows/ os=WINNT
% skin formautofill-shared classic/1.0 %skin/shared/
skin/ (skin/*)
--- a/browser/extensions/pocket/jar.mn
+++ b/browser/extensions/pocket/jar.mn
@@ -1,15 +1,15 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
[features/firefox@getpocket.com] chrome.jar:
% content pocket %content/ contentaccessible=yes
-% skin pocket classic/1.0 %skin/linux/
+% skin pocket classic/1.0 %skin/linux/ os=LikeUnix
% skin pocket classic/1.0 %skin/osx/ os=Darwin
% skin pocket classic/1.0 %skin/windows/ os=WINNT
% skin pocket-shared classic/1.0 %skin/shared/
content/ (content/*)
skin/shared (skin/shared/*)
#ifdef XP_WIN
skin/windows/ (skin/windows/*.png)
* skin/windows/pocket.css (skin/windows/pocket.css)
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -87,17 +87,17 @@
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/gtk/
+% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/ os=LikeUnix os=Android
% 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/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/gtk/intl.properties (%chrome/global-platform/unix/intl.properties)
locale/@AB_CD@/global-platform/win/intl.properties (%chrome/global-platform/win/intl.properties)
