Bug 1436887 - [1.1] Add GeckoView prefs file. r=snorp,jchen
authorEugen Sawin <esawin@mozilla.com>
Mon, 12 Feb 2018 19:31:53 +0100
changeset 403672 9dd1395b937eeafce2888c4d502e512fa38549d2
parent 403671 56c8882ff0b26e1a5025033f8c1ec61eb843afce
child 403673 84f2405b197addc94032af65bdaa91696884a6a7
push id99858
push useresawin@mozilla.com
push dateWed, 14 Feb 2018 18:53:04 +0000
treeherdermozilla-inbound@9dd1395b937e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp, jchen
bugs1436887
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1436887 - [1.1] Add GeckoView prefs file. r=snorp,jchen
.eslintignore
mobile/android/app/geckoview-prefs.js
mobile/android/app/moz.build
mobile/android/installer/package-manifest.in
--- a/.eslintignore
+++ b/.eslintignore
@@ -319,16 +319,17 @@ js/src/Y.js
 # Third-party
 media/webrtc/trunk/**
 
 # mobile/android/ exclusions
 mobile/android/tests/browser/chrome/tp5/**
 
 # Uses `#filter substitution`
 mobile/android/app/mobile.js
+mobile/android/app/geckoview-prefs.js
 
 # Uses `#expand`
 mobile/android/chrome/content/about.js
 
 # Not much JS to lint and non-standard at that
 mobile/android/installer/
 mobile/android/locales/
 
new file mode 100644
--- /dev/null
+++ b/mobile/android/app/geckoview-prefs.js
@@ -0,0 +1,9 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#filter substitution
+
+#include mobile.js
+
+pref("privacy.trackingprotection.pbmode.enabled", false);
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -44,16 +44,17 @@ for var in ('MOZ_ANDROID_GCM', ):
 for var in ('MOZ_ANDROID_GCM_SENDERID', ):
     if CONFIG[var]:
         DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_PKG_SPECIAL']:
     DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']
 
 JS_PREFERENCE_PP_FILES += [
+     'geckoview-prefs.js',
      'mobile.js',
 ]
 
 FINAL_TARGET_PP_FILES += [
   'ua-update.json.in',
 ]
 
 if CONFIG['MOZ_ANDROID_GOOGLE_VR']:
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -430,17 +430,21 @@
 @BINPATH@/features/*
 
 ; DevTools
 @BINPATH@/chrome/devtools@JAREXT@
 @BINPATH@/chrome/devtools.manifest
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
+#ifdef MOZ_GECKOVIEW_JAR
+@BINPATH@/@PREF_DIR@/geckoview-prefs.js
+#else
 @BINPATH@/@PREF_DIR@/mobile.js
+#endif
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 @BINPATH@/ua-update.json
 @BINPATH@/greprefs.js
 @BINPATH@/defaults/autoconfig/prefcalls.js
 
 ; [Layout Engine Resources]
 ; Style Sheets, Graphics and other Resources used by the layout engine.
 @BINPATH@/res/EditorOverride.css