Bug 1838754 - Pre 3: Normalize moz.build and components.conf build exclusions related to Windows Toast on excluding gcc builds. r=mossop

Depends on D183438

Differential Revision: https://phabricator.services.mozilla.com/D187067

toolkit/moz.build

@@ -25,11 +25,15 @@ DIRS += [
 ]
 
 if CONFIG["OS_ARCH"] == "WINNT":
-    if CONFIG["MOZ_NOTIFICATION_SERVER"]:
-        DIRS += ["mozapps/notificationserver"]
+    # mingw is missing Windows toast notification definitions.
+    if CONFIG["CC_TYPE"] == "clang-cl":
+        if CONFIG["MOZ_NOTIFICATION_SERVER"]:
+            DIRS += ["mozapps/notificationserver"]
 
-    if CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
-        DIRS += ["mozapps/defaultagent"]
+        # Default Browser Agent relies on Windows toast notifications, so should
+        # also not be built with mingw.
+        if CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
+            DIRS += ["mozapps/defaultagent"]
 
 if CONFIG["MOZ_UPDATER"] and CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
     DIRS += ["mozapps/update"]

widget/windows/components.conf

@@ -167,7 +167,7 @@ Classes = [
     },
 ]
 
-if buildconfig.substs['CC_TYPE'] in ('msvc', 'clang-cl'):
+if buildconfig.substs['CC_TYPE'] == 'clang-cl':
     Classes += [
         {
             'cid': '{84e11f80-ca55-11dd-ad8b-0800200c9a66}',

widget/windows/moz.build

@@ -198,6 +198,7 @@ OS_LIBS += [
     "urlmon",
 ]
 
+# mingw is missing Windows toast notification definitions.
 if CONFIG["CC_TYPE"] == "clang-cl":
     SOURCES += [
         "ToastNotification.cpp",