Commit 17fb8bac authored by Stanca Serban's avatar Stanca Serban
Browse files

Backed out changeset 50b448b2d902 (bug 1532281) for causing Linux build bustages. CLOSED TREE

parent 91cdc5cb

browser/components/shell/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -85,5 +85,8 @@ for var in ( 
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



if CONFIG["MOZ_ENABLE_DBUS"]:

    CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]



with Files("**"):

    BUG_COMPONENT = ("Firefox", "Shell Integration")

config/system-headers.mozbuild

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ system_headers = [ 
    'curses.h',

    'cxxabi.h',

    'DateTimeUtils.h',

    'dbus/dbus-glib.h',

    'dbus/dbus-glib-lowlevel.h',

    'dbus/dbus.h',

    'ddeml.h',

    'Debug.h',

dom/gamepad/moz.build

+2 −0
Original line number Diff line number Diff line
@@ -76,4 +76,6 @@ LOCAL_INCLUDES += [ 
]



CFLAGS += CONFIG["GLIB_CFLAGS"]

CFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

CXXFLAGS += CONFIG["GLIB_CFLAGS"]

CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

dom/geolocation/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -57,4 +57,5 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": 
        DEFINES["MOZ_GPSD"] = True

    if CONFIG["MOZ_ENABLE_DBUS"]:

        LOCAL_INCLUDES += ["/dom/system/linux"]

        CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

        CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

dom/system/linux/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ if CONFIG["MOZ_ENABLE_DBUS"]: 
    SOURCES += ["GeoclueLocationProvider.cpp"]

    SOURCES += ["PortalLocationProvider.cpp"]

    LOCAL_INCLUDES += ["/dom/geolocation"]

    CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



FINAL_LIBRARY = "xul"