commit 0c8e0d3e8de4ad52d10a9d0a7bb789e676f432ab Author: Kathy Brade brade@pearlcrescent.com Date: Tue May 19 14:29:30 2020 -0400

Bug 33851: Omit parental controls when building Firefox and GeckoView --- projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-android-x86_64 | 1 + projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + projects/geckoview/mozconfig-android-aarch64 | 1 + projects/geckoview/mozconfig-android-armv7 | 1 + projects/geckoview/mozconfig-android-x86 | 1 + projects/geckoview/mozconfig-android-x86_64 | 1 + 13 files changed, 13 insertions(+)

diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index 9e4173f..fd86f23 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index d13f870..9ee3bfe 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index 019094c..f7e1ffa 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 index 999f51f..3c78993 100644 --- a/projects/firefox/mozconfig-android-x86_64 +++ b/projects/firefox/mozconfig-android-x86_64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --without-google-play-services

diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 3ea241f..76c3ba3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index e4d2b99..251cdc0 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9b0773d..09c53fc 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -41,6 +41,7 @@ ac_add_options --enable-verify-mar

ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a2364e9..eb4e212 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests

# Disable telemetry diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 188b3c5..655ca12 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests

# Disable telemetry diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index dc72f3f..d7b29e0 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --enable-proxy-bypass-protection

diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 36140a5..21d2fa0 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --enable-proxy-bypass-protection

diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index fe703ea..1d6fb3c 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --enable-proxy-bypass-protection

diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index cddfc09..f6111d3 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls

ac_add_options --enable-proxy-bypass-protection