Bug 1833855 [Linux] Update widget/gtk for wayland/x11 exclusive builds r=emilio

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

widget/gtk/moz.build

@@ -47,16 +47,29 @@ EXPORTS.mozilla += [
 ]
 
 EXPORTS.mozilla.widget += [
+    "CompositorWidgetChild.h",
+    "CompositorWidgetParent.h",
+    "DMABufLibWrapper.h",
+    "DMABufSurface.h",
+    "gbm.h",
+    "GtkCompositorWidget.h",
+    "InProcessGtkCompositorWidget.h",
+    "va_drmcommon.h",
     "WindowSurface.h",
     "WindowSurfaceProvider.h",
 ]
 
 UNIFIED_SOURCES += [
     "AsyncGtkClipboardRequest.cpp",
+    "CompositorWidgetChild.cpp",
+    "CompositorWidgetParent.cpp",
+    "DMABufLibWrapper.cpp",
+    "DMABufSurface.cpp",
     "GfxInfo.cpp",
     "gtk3drawing.cpp",
     "GtkCompositorWidget.cpp",
     "IMContextWrapper.cpp",
+    "InProcessGtkCompositorWidget.cpp",
     "MozContainer.cpp",
     "MPRISServiceHandler.cpp",
     "NativeKeyBindings.cpp",
@@ -74,6 +87,7 @@ UNIFIED_SOURCES += [
     "nsLookAndFeel.cpp",
     "nsSound.cpp",
     "nsToolkit.cpp",
+    "nsUserIdleServiceGTK.cpp",
     "nsWidgetFactory.cpp",
     "ScreenHelperGTK.cpp",
     "TaskbarProgress.cpp",
@@ -93,8 +107,6 @@ SOURCES += [
 
 if CONFIG["MOZ_WAYLAND"]:
     UNIFIED_SOURCES += [
-        "DMABufLibWrapper.cpp",
-        "DMABufSurface.cpp",
         "MozContainerWayland.cpp",
         "nsClipboardWayland.cpp",
         "nsWaylandDisplay.cpp",
@@ -102,27 +114,11 @@ if CONFIG["MOZ_WAYLAND"]:
         "WindowSurfaceWaylandMultiBuffer.cpp",
     ]
     EXPORTS.mozilla.widget += [
-        "DMABufLibWrapper.h",
-        "DMABufSurface.h",
         "MozContainerWayland.h",
         "nsWaylandDisplay.h",
         "WaylandBuffer.h",
     ]
 
-if CONFIG["MOZ_X11"] or CONFIG["MOZ_WAYLAND"]:
-    UNIFIED_SOURCES += [
-        "CompositorWidgetChild.cpp",
-        "CompositorWidgetParent.cpp",
-        "InProcessGtkCompositorWidget.cpp",
-        "nsUserIdleServiceGTK.cpp",
-    ]
-    EXPORTS.mozilla.widget += [
-        "CompositorWidgetChild.h",
-        "CompositorWidgetParent.h",
-        "GtkCompositorWidget.h",
-        "InProcessGtkCompositorWidget.h",
-    ]
-
 if CONFIG["MOZ_X11"]:
     UNIFIED_SOURCES += [
         "nsClipboardX11.cpp",
@@ -157,13 +153,9 @@ LOCAL_INCLUDES += [
     "/third_party/cups/include",
     "/widget",
     "/widget/headless",
+    "/widget/x11",
 ]
 
-if CONFIG["MOZ_X11"] or CONFIG["MOZ_WAYLAND"]:
-    LOCAL_INCLUDES += [
-        "/widget/x11",
-    ]
-
 DEFINES["CAIRO_GFX"] = True
 
 DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]

widget/gtk/wayland/moz.build

@@ -18,12 +18,10 @@ SOURCES += [
 ]
 
 EXPORTS.mozilla.widget += [
-    "gbm.h",
     "idle-inhibit-unstable-v1-client-protocol.h",
     "linux-dmabuf-unstable-v1-client-protocol.h",
     "pointer-constraints-unstable-v1-client-protocol.h",
     "relative-pointer-unstable-v1-client-protocol.h",
-    "va_drmcommon.h",
     "viewporter-client-protocol.h",
     "xdg-activation-v1-client-protocol.h",
     "xdg-output-unstable-v1-client-protocol.h",