mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out 4 changesets (bug 1365419) for android mochitest failures in test_bug583533.html a=backout 

Backed out changeset d82aa6aec2c1 (bug 1365419)
Backed out changeset 9aafdd1ca0bd (bug 1365419)
Backed out changeset 261eecf8497f (bug 1365419)
Backed out changeset 1d9b50fadc05 (bug 1365419)

MozReview-Commit-ID: HkhXf1Dkkbk
This commit is contained in:
Wes Kocher 2017-06-01 18:39:21 -07:00
Родитель 4f22901fcd
Коммит 9782406dd8
10 изменённых файлов: 18 добавлений и 31 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
browser/base/content/test/static/browser_all_files_referenced.js
Просмотреть файл

@ -98,11 +98,11 @@ var whitelist = new Set([
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"]},

2
browser/extensions/flyweb/jar.mn
Просмотреть файл

@ -3,7 +3,7 @@
# 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/ os=LikeUnix
% skin flyweb classic/1.0 %skin/linux/
% 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/

2
browser/extensions/formautofill/jar.mn
Просмотреть файл

@ -9,7 +9,7 @@
% content formautofill %content/
content/ (content/*)
% skin formautofill classic/1.0 %skin/linux/ os=LikeUnix
% skin formautofill classic/1.0 %skin/linux/
% 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/

2
browser/extensions/pocket/jar.mn
Просмотреть файл

@ -4,7 +4,7 @@
[features/firefox@getpocket.com] chrome.jar:
% content pocket %content/ contentaccessible=yes
% skin pocket classic/1.0 %skin/linux/ os=LikeUnix
% skin pocket classic/1.0 %skin/linux/
% 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/

6
browser/installer/allowed-dupes.mn
Просмотреть файл

@ -192,9 +192,9 @@ 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

2
dom/locales/jar.mn
Просмотреть файл

@ -30,6 +30,6 @@
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)

6
mobile/android/installer/allowed-dupes.mn
Просмотреть файл

@ -84,9 +84,9 @@ 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

2
python/mozbuild/mozpack/packager/l10n.py
Просмотреть файл

@ -139,7 +139,7 @@ def _repack(app_finder, l10n_finder, copier, formatter, non_chrome=set()):
errors.fatal("Locale doesn't contain %s/" % base)
# Allow errors to accumulate
continue
if key(e) not in l10n_paths[base]:
if e.name not in l10n_paths[base]:
errors.fatal("Locale doesn't have a manifest entry for '%s'" %
e.name)
# Allow errors to accumulate

6
toolkit/locales/jar.mn
Просмотреть файл

@ -92,14 +92,14 @@
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/unix/ os=LikeUnix
% 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)

15
xpcom/components/ManifestParser.cpp
Просмотреть файл

@ -319,19 +319,6 @@ CheckStringFlag(const nsSubstring& aFlag, const nsSubstring& aData,
return true;
}
static bool
CheckOsFlag(const nsSubstring& aFlag, const nsSubstring& aData,
const nsSubstring& aValue, TriState& aResult)
{
bool result = CheckStringFlag(aFlag, aData, aValue, aResult);
#if defined(XP_UNIX) && !defined(XP_DARWIN) && !defined(ANDROID)
if (result && aResult == eBad) {
result = CheckStringFlag(aFlag, aData, NS_LITERAL_STRING("likeunix"), aResult);
}
#endif
return result;
}
/**
* Check for a modifier flag of the following form:
* "flag=version"
@ -678,7 +665,7 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
NS_ConvertASCIItoUTF16 wtoken(token);
if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||
CheckOsFlag(kOs, wtoken, osTarget, stOs) ||
CheckStringFlag(kOs, wtoken, osTarget, stOs) ||
CheckStringFlag(kABI, wtoken, abi, stABI) ||
CheckStringFlag(kProcess, wtoken, process, stProcess) ||
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||