Bug 1601076 - Fix some broken BUG_COMPONENTS in moz.build files; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Wed, 04 Dec 2019 13:55:45 +0000
changeset 505445 b2eeefe2fdec17f6ba98eb2074fca34ef2f7f167
parent 505444 f0470f060cb38a209bbea9e3238bd2d5ce51630d
child 505446 d8b0a5b0a5afb91ec00330a5c2a9b341ff66ff5f
push id36883
push userapavel@mozilla.com
push dateThu, 05 Dec 2019 04:11:08 +0000
treeherdermozilla-central@ba237def08d5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1601076
milestone73.0a1
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
Bug 1601076 - Fix some broken BUG_COMPONENTS in moz.build files; r=jmaher Some of these were obvious typos. Others probably reflect once-correct components that have been combined, split, or otherwise obsoleted; for these I've tried to use the component associated with the bugs for recent changes to the affected files. Differential Revision: https://phabricator.services.mozilla.com/D55756
browser/components/library/moz.build
browser/components/syncedtabs/moz.build
browser/extensions/report-site-issue/moz.build
browser/extensions/webcompat/moz.build
docshell/test/moz.build
dom/reporting/moz.build
dom/tests/moz.build
layout/xul/moz.build
mobile/android/app/moz.build
mobile/android/base/moz.build
mobile/android/installer/moz.build
mobile/android/moz.build
mobile/locales/moz.build
moz.build
python/moz.build
services/fxaccounts/moz.build
testing/config/moz.build
testing/modules/moz.build
testing/tps/moz.build
testing/web-platform/moz.build
third_party/python/moz.build
toolkit/content/moz.build
toolkit/modules/moz.build
toolkit/mozapps/extensions/test/moz.build
tools/moz.build
widget/android/bindings/moz.build
--- a/browser/components/library/moz.build
+++ b/browser/components/library/moz.build
@@ -3,9 +3,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/.
 
 JAR_MANIFESTS += ['jar.mn']
 FINAL_LIBRARY = 'browsercomps'
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Library')
+    BUG_COMPONENT = ('Firefox', 'New Tab Page')
--- a/browser/components/syncedtabs/moz.build
+++ b/browser/components/syncedtabs/moz.build
@@ -15,10 +15,10 @@ EXTRA_JS_MODULES.syncedtabs += [
     'SyncedTabsDeckView.js',
     'SyncedTabsListStore.js',
     'TabListComponent.js',
     'TabListView.js',
     'util.js',
 ]
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Synced tabs')
+    BUG_COMPONENT = ('Firefox', 'Sync')
 
--- a/browser/extensions/report-site-issue/moz.build
+++ b/browser/extensions/report-site-issue/moz.build
@@ -29,9 +29,9 @@ FINAL_TARGET_FILES.features['webcompat-r
 
 FINAL_TARGET_FILES.features['webcompat-reporter@mozilla.org'].icons += [
   'icons/lightbulb.svg'
 ]
 
 BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
 with Files('**'):
-    BUG_COMPONENT = ('Web Compatibility Tools', 'General')
+    BUG_COMPONENT = ('Web Compatibility', 'Tooling & Investigations')
--- a/browser/extensions/webcompat/moz.build
+++ b/browser/extensions/webcompat/moz.build
@@ -73,9 +73,9 @@ FINAL_TARGET_FILES.features['webcompat@m
   'lib/custom_functions.js',
   'lib/google.js',
   'lib/injections.js',
   'lib/module_shim.js',
   'lib/ua_overrides.js',
 ]
 
 with Files('**'):
-  BUG_COMPONENT = ('Web Compatibility Tools', 'Go Faster')
+  BUG_COMPONENT = ('Web Compatibility', 'Tooling & Investigations')
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -74,17 +74,17 @@ with Files('mochitest/*1045096*'):
 
 with Files('mochitest/*1151421*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*402210*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 with Files('mochitest/*509055*'):
-    BUG_COMPONENT = ('Core', 'History: Global')
+    BUG_COMPONENT = ('Firefox', 'Bookmarks & History')
 
 with Files('mochitest/*511449*'):
     BUG_COMPONENT = ('Core', 'Widget: Cocoa')
 
 with Files('mochitest/*551225*'):
     BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
 
 with Files('mochitest/*570341*'):
--- a/dom/reporting/moz.build
+++ b/dom/reporting/moz.build
@@ -34,16 +34,16 @@ UNIFIED_SOURCES += [
 
 IPDL_SOURCES += [
     'PEndpointForReport.ipdl',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 with Files('**'):
-    BUG_COMPONENT = ('DOM', 'Security')
+    BUG_COMPONENT = ('Core', 'DOM: Security')
 
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
 
 TEST_DIRS += [ 'tests/gtest' ]
--- a/dom/tests/moz.build
+++ b/dom/tests/moz.build
@@ -12,23 +12,23 @@ with Files("browser/*onsole*"):
 
 with Files("browser/*autofocus*"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("browser/*unload*"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("browser/*1238427*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/*Geolocation*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/*geo_*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("browser/browser_cancel_keydown_keypress_event.js"):
     BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling")
 
 with Files("browser/*local*"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("browser/browser_test_focus_after_modal_state.js"):
@@ -75,17 +75,17 @@ with Files("mochitest/fetch/*sw_*"):
 with Files("mochitest/gamepad/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 # TODO: big mix of components here
 with Files("mochitest/general/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mochitest/geolocation/**"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("mochitest/localstorage/**"):
     BUG_COMPONENT = ("Core", "Storage: localStorage & sessionStorage")
 
 with Files("mochitest/orientation/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("mochitest/orientation/*507902*"):
@@ -135,17 +135,17 @@ with Files("reftest/*798068*"):
 
 with Files("reftest/xml-stylesheet/**"):
     BUG_COMPONENT = ("Core", "XSLT")
 
 with Files("unit/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("unit/*geolocation*"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("unit/test_bug465752.js"):
     BUG_COMPONENT = ("Core", "CSS Parsing and Computation")
 
 with Files("unit/test_PromiseDebugging.js"):
     BUG_COMPONENT = ("Core", "XPConnect")
 
 MOCHITEST_MANIFESTS += [
--- a/layout/xul/moz.build
+++ b/layout/xul/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'XUL')
 
 with Files('*Menu*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 
 if CONFIG['ENABLE_TESTS']:
     MOCHITEST_MANIFESTS += ['test/mochitest.ini']
     MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
     BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
 EXPORTS += [
     'nsBox.h',
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -1,22 +1,19 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
-
-with Files('mobile*'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('omnijar/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 for var in ('APP_NAME', 'APP_VERSION'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
 for var in ('MOZ_UPDATER', 'MOZ_APP_UA_NAME', 'ANDROID_PACKAGE_NAME', 'CPU_ARCH'):
     DEFINES[var] = CONFIG[var]
 
 for var in ('MOZ_ANDROID_GCM', ):
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('locales/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
 # The recursive make backend treats the first output specially: it's passed as
 # an open FileAvoidWrite to the invoked script.  That doesn't work well with
 # the Gradle task that generates all of the outputs, so we add a dummy first
--- a/mobile/android/installer/moz.build
+++ b/mobile/android/installer/moz.build
@@ -1,8 +1,8 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -1,23 +1,23 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
     SCHEDULES.exclusive = ['android']
 
 with Files('branding/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('config/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('docs/**'):
     BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('geckoview/**'):
     BUG_COMPONENT = ('GeckoView', 'General')
 
 with Files('geckoview/src/main/aidl/**'):
@@ -25,17 +25,17 @@ with Files('geckoview/src/main/aidl/**')
 
 with Files('geckoview/src/main/java/org/mozilla/gecko/mozglue/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Audio/Video')
 
 with Files('geckoview_example/**'):
     BUG_COMPONENT = ('GeckoView', 'General')
 
 with Files('gradle/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('themes/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Theme and Visual Design')
 
 CONFIGURE_SUBST_FILES += ['installer/Makefile']
 
 DIRS += [
     '../locales',
--- a/mobile/locales/moz.build
+++ b/mobile/locales/moz.build
@@ -1,10 +1,10 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Locale Switching')
+    BUG_COMPONENT = ('Firefox for Android', 'Locale switching and selection')
 
-JAR_MANIFESTS += ['jar.mn']
\ No newline at end of file
+JAR_MANIFESTS += ['jar.mn']
--- a/moz.build
+++ b/moz.build
@@ -33,17 +33,17 @@ with Files('mach'):
 
 with Files('*moz*'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('GNUmakefile'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('*gradle*'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
     SCHEDULES.exclusive = ['android']
 
 with Files('*.json'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('**/l10n.toml'):
     BUG_COMPONENT = ('Core', 'Localization')
     FINAL = True
--- a/python/moz.build
+++ b/python/moz.build
@@ -19,26 +19,26 @@ with Files('mach/**'):
 
 with Files('mozboot/**'):
     BUG_COMPONENT = ('Firefox Build System', 'Bootstrap Configuration')
 
 with Files('mozbuild/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozlint/**'):
-    BUG_COMPONENT = ('Testing', 'Lint')
+    BUG_COMPONENT = ('Firefox Build System', 'Linting and Formatting')
 
 with Files('mozversioncontrol/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('l10n/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mozrelease/**'):
-    BUG_COMPONENT = ('Release Engineering', 'Release Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('mach_commands.py'):
     BUG_COMPONENT = ('Testing', 'Python Test')
 
 SPHINX_PYTHON_PACKAGE_DIRS += [
     'mach',
     'mozbuild/mozbuild',
     'mozbuild/mozpack',
--- a/services/fxaccounts/moz.build
+++ b/services/fxaccounts/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Core', 'fxAccounts')
+    BUG_COMPONENT = ('Firefox', 'Firefox Accounts')
 
 DIRS += ['interfaces']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 
 BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
--- a/testing/config/moz.build
+++ b/testing/config/moz.build
@@ -13,9 +13,9 @@ with Files("mozbase*"):
 
 with Files("firefox_ui*"):
     BUG_COMPONENT = ("Testing", "Firefox UI Tests")
 
 with Files("telemetry*"):
     BUG_COMPONENT = ("Toolkit", "Telemetry")
 
 with Files("tooltool-manifests/**"):
-    BUG_COMPONENT = ("Release Engineering", "Mozharness")
+    BUG_COMPONENT = ("Release Engineering", "Applications: MozharnessCore")
--- a/testing/modules/moz.build
+++ b/testing/modules/moz.build
@@ -31,9 +31,9 @@ TEST_HARNESS_FILES.testing.mochitest.tes
 
 with Files("**"):
     BUG_COMPONENT = ("Testing", "General")
 
 with Files("tests/xpcshell/**"):
     BUG_COMPONENT = ("Testing", "XPCShell Harness")
 
 with Files("tests/browser/**"):
-    BUG_COMPONENT = ("Testing", "BrowserTest")
+    BUG_COMPONENT = ("Testing", "General")
--- a/testing/tps/moz.build
+++ b/testing/tps/moz.build
@@ -1,8 +1,8 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Testing", "TPS")
+    BUG_COMPONENT = ("Testing", "General")
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -71,17 +71,17 @@ with Files("mozilla/tests/html/semantics
 
 with Files("mozilla/tests/html/semantics/scripting-1/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("mozilla/tests/placeholder"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
+    BUG_COMPONENT = ("Core", "Javascript: WebAssembly")
 
 with Files("update/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mach*"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("*.py"):
@@ -476,17 +476,17 @@ with Files("tests/fonts/math/**"):
 
 with Files("tests/fullscreen/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/gamepad/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/geolocation-API/**"):
-    BUG_COMPONENT = ("Core", "Geolocation")
+    BUG_COMPONENT = ("Core", "DOM: Geolocation")
 
 with Files("tests/gyroscope/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/hr-time/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/html/**"):
@@ -619,17 +619,17 @@ with Files("tests/picture-in-picture/**"
 
 with Files("tests/pointerevents/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/pointerlock/**"):
     BUG_COMPONENT = ("Core", "DOM: Events")
 
 with Files("tests/preload/**"):
-    BUG_COMPONENT = ("Core", "DOM: Core & Html")
+    BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/presentation-api/**"):
     BUG_COMPONENT = ("Core", "DOM: Core & HTML")
 
 with Files("tests/proximity/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/quirks/**"):
@@ -677,17 +677,17 @@ with Files("tests/shadow-dom/**"):
 
 with Files("tests/speech-api/**"):
     BUG_COMPONENT = ("Core", "Web Speech")
 
 with Files("tests/storage/**"):
     BUG_COMPONENT = ("Core", "Storage: Quota Manager")
 
 with Files("tests/streams/**"):
-    BUG_COMPONENT = ("Core", "Javascript Engine")
+    BUG_COMPONENT = ("Core", "JavaScript Engine")
 
 with Files("tests/subresource-integrity/**"):
     BUG_COMPONENT = ("Core", "DOM: Security")
 
 with Files("tests/svg/**"):
     BUG_COMPONENT = ("Core", "SVG")
 
 with Files("tests/svg-aam/**"):
@@ -719,17 +719,17 @@ with Files("tests/vibration/**"):
 
 with Files("tests/visual-viewport/**"):
     BUG_COMPONENT = ("Core", "Layout")
 
 with Files("tests/wai-aria/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
+    BUG_COMPONENT = ("Core", "Javascript: WebAssembly")
 
 with Files("tests/web-animations/**"):
     BUG_COMPONENT = ("Core", "DOM: Animation")
 
 with Files("tests/webaudio/**"):
     BUG_COMPONENT = ("Core", "Web Audio")
 
 with Files("tests/webauthn/**"):
@@ -758,20 +758,20 @@ with Files("tests/websockets/**"):
 
 with Files("tests/webstorage/**"):
     BUG_COMPONENT = ("Core", "Storage: localStorage & sessionStorage")
 
 with Files("tests/webusb/**"):
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("tests/webvr/**"):
-    BUG_COMPONENT = ("Core", "DOM: WebVR")
+    BUG_COMPONENT = ("Core", "WebVR")
 
 with Files("tests/webxr/**"):
-    BUG_COMPONENT = ("Core", "DOM: WebVR")
+    BUG_COMPONENT = ("Core", "WebVR")
 
 with Files("tests/webvtt/**"):
     BUG_COMPONENT = ("Core", "Audio/Video: Playback")
 
 with Files("tests/workers/**"):
     BUG_COMPONENT = ("Core", "DOM: Workers")
 
 # to be implemented in bug 1315239
--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -22,44 +22,44 @@ with Files('compare-locales/**'):
 
 with Files('configobj/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('dlmanager/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('enum34/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('futures/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('jsmin/**'):
-    BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
+    BUG_COMPONENT = ('Firefox for Android', 'General')
 
 with Files('lldbutils/**'):
     BUG_COMPONENT = ('Core', 'General')
 
 with Files('mock-1.0.0/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('mohawk/**'):
     BUG_COMPONENT = ('Taskcluster', 'Platform Libraries')
 
 with Files('mozilla-version/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('psutil/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('py/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('pyasn1/**'):
-    BUG_COMPONENT = ('Release Engineering', 'General Automation')
+    BUG_COMPONENT = ('Release Engineering', 'General')
 
 with Files('pyasn1-modules/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('pylru/**'):
     BUG_COMPONENT = ('mozilla.org', 'MozillaBuild')
 
 with Files('pystache/**'):
--- a/toolkit/content/moz.build
+++ b/toolkit/content/moz.build
@@ -159,19 +159,19 @@ with Files('tests/chrome/*437844*'):
     BUG_COMPONENT = ('Toolkit', 'General')
 with Files('tests/chrome/rtlchrome/**'):
     BUG_COMPONENT = ('Toolkit', 'General')
 
 with Files('tests/chrome/*451540*'):
     BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
 
 with Files('tests/chrome/*557987*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 with Files('tests/chrome/*562554*'):
-    BUG_COMPONENT = ('Core', 'XP Toolkit/Widgets: Menus')
+    BUG_COMPONENT = ('Firefox', 'Menus')
 
 with Files('tests/chrome/*570192*'):
     BUG_COMPONENT = ('Firefox', 'Session Restore')
 
 with Files('tests/chrome/*findbar*'):
     BUG_COMPONENT = ('Toolkit', 'Find Toolbar')
 
 with Files('tests/chrome/test_preferences*'):
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -74,17 +74,17 @@ with Files('Finder*.jsm'):
 
 with Files('FormLikeFactory.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Password Manager')
 
 with Files('IndexedDB.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Async Tooling')
 
 with Files('InlineSpellChecker*.jsm'):
-    BUG_COMPONENT = ('Core', 'Spell Checker')
+    BUG_COMPONENT = ('Core', 'Spelling checker')
 
 with Files('Integration.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Async Tooling')
 
 with Files('JSONFile.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Form Manager')
 
 with Files('LightweightThemeConsumer.jsm'):
--- a/toolkit/mozapps/extensions/test/moz.build
+++ b/toolkit/mozapps/extensions/test/moz.build
@@ -13,12 +13,12 @@ MOCHITEST_CHROME_MANIFESTS += ['mochites
 XPCSHELL_TESTS_MANIFESTS += [
     'xpcshell/rs-blocklist/xpcshell.ini',
     'xpcshell/xml-blocklist/xpcshell.ini',
     'xpcshell/xpcshell-unpack.ini',
     'xpcshell/xpcshell.ini',
 ]
 
 with Files('xpcshell/rs-blocklist/**'):
-    BUG_COMPONENT = ('Toolkit', 'Blockist Implementation')
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
 
 with Files('xpcshell/xml-blocklist/**'):
-    BUG_COMPONENT = ('Toolkit', 'Blockist Implementation')
+    BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation')
--- a/tools/moz.build
+++ b/tools/moz.build
@@ -40,17 +40,17 @@ with Files("rewriting/**"):
 
 with Files("tryselect/**"):
     BUG_COMPONENT = ("Firefox Build System", "Try")
 
 with Files("tryselect/selectors/release.py"):
     BUG_COMPONENT = ("Release Engineering", "General")
 
 with Files("update-packaging/**"):
-    BUG_COMPONENT = ("Release Engineering", "Other")
+    BUG_COMPONENT = ("Release Engineering", "General")
 
 with Files("update-verify/**"):
     BUG_COMPONENT = ("Release Engineering", "Release Automation: Updates")
 
 SPHINX_TREES['lint'] = 'lint/docs'
 
 with Files('lint/docs/**'):
     SCHEDULES.exclusive = ['docs']
--- a/widget/android/bindings/moz.build
+++ b/widget/android/bindings/moz.build
@@ -1,16 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Firefox for Android", "Graphics, Panning and Zooming")
+    BUG_COMPONENT = ("Firefox for Android", "General")
 
 # List of stems to generate .cpp and .h files for.  To add a stem, add it to
 # this list and ensure that $(stem)-classes.txt exists in this directory.
 generated = [
     'AccessibilityEvent',
     'AndroidBuild',
     'AndroidGraphics',
     'AndroidInputType',