Backed out changeset 7ceb0427f883 (bug 1510711) for Android mochitest failures on testJarReader.
authorCosmin Sabou <csabou@mozilla.com>
Wed, 26 Dec 2018 23:34:49 +0200
changeset 509057 d8deeeb37952ad156be7468e44eaa990092328e8
parent 509056 252193307797bda3bb7e1071d7d77fa245ee909e
child 509058 1f7282fade712b51ebea617aba55438cf286b24d
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1510711
milestone66.0a1
backs out7ceb0427f883d038bcca141a502845ce6eb92e1b
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 7ceb0427f883 (bug 1510711) for Android mochitest failures on testJarReader.
mobile/android/branding/beta/content/jar.mn
mobile/android/branding/nightly/content/jar.mn
mobile/android/branding/official/content/jar.mn
mobile/android/branding/unofficial/content/jar.mn
mobile/android/chrome/geckoview/jar.mn
mobile/android/chrome/jar.mn
--- a/mobile/android/branding/beta/content/jar.mn
+++ b/mobile/android/branding/beta/content/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
-geckoview.jar:
+chrome.jar:
 % content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
   content/branding/favicon32.png                 (favicon32.png)
   content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/nightly/content/jar.mn
+++ b/mobile/android/branding/nightly/content/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
-geckoview.jar:
+chrome.jar:
 % content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
   content/branding/favicon32.png                 (favicon32.png)
   content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/official/content/jar.mn
+++ b/mobile/android/branding/official/content/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
-geckoview.jar:
+chrome.jar:
 % content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
   content/branding/favicon32.png                 (favicon32.png)
   content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/branding/unofficial/content/jar.mn
+++ b/mobile/android/branding/unofficial/content/jar.mn
@@ -1,9 +1,9 @@
 # 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/.
 
-geckoview.jar:
+chrome.jar:
 % content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
   content/branding/favicon32.png                 (favicon32.png)
   content/branding/favicon64.png                 (favicon64.png)
--- a/mobile/android/chrome/geckoview/jar.mn
+++ b/mobile/android/chrome/geckoview/jar.mn
@@ -15,10 +15,8 @@ geckoview.jar:
   content/GeckoViewContentChild.js
   content/GeckoViewMediaChild.js
   content/GeckoViewNavigationChild.js
   content/GeckoViewProgressChild.js
   content/GeckoViewPromptChild.js
   content/GeckoViewScrollChild.js
   content/GeckoViewSettingsChild.js
   content/GeckoViewSelectionActionChild.js
-
-% content branding %content/branding/
--- a/mobile/android/chrome/jar.mn
+++ b/mobile/android/chrome/jar.mn
@@ -43,16 +43,18 @@ chrome.jar:
   content/aboutAccounts.xhtml          (content/aboutAccounts.xhtml)
   content/aboutAccounts.js             (content/aboutAccounts.js)
   content/aboutExperiments.xhtml       (content/aboutExperiments.xhtml)
   content/aboutExperiments.js          (content/aboutExperiments.js)
   content/aboutLogins.xhtml            (content/aboutLogins.xhtml)
   content/aboutLogins.js               (content/aboutLogins.js)
   content/ExtensionPermissions.js      (content/ExtensionPermissions.js)
 
+% content branding %content/branding/
+
 % 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/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties
 % override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd
 % override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties
 % override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties