Commit b4820a1d authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 2016052 - Add a build flag to disable system preferences. r=gstoll 

Differential Revision: https://phabricator.services.mozilla.com/D282768
parent ff03189f

modules/libpref/Preferences.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5082,7 +5082,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) { 
    }

  }



#if defined(MOZ_WIDGET_GTK)

#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)

  // To ensure the system-wide preferences are not overwritten by

  // firefox/browser/defauts/preferences/*.js we need to load

  // the /etc/firefox/defaults/pref/*.js settings as last.

toolkit/moz.configure

+11 −0
Original line number Diff line number Diff line
@@ -3961,6 +3961,17 @@ option( 


set_config("MOZ_SYSTEM_POLICIES", True, when="--enable-system-policies")



# System preferences

# ==============================================================



option(

    "--disable-system-preferences",

    help="Disable reading preferences from /etc/firefox",

)



set_config("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")

set_define("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")



# Allow disabling the creation a legacy profile

# ==============================================================