From f5a22c84c4cefbf289e3338eebcb9fbb85a16fc6 Mon Sep 17 00:00:00 2001
From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Fri, 19 Jan 2018 23:49:11 +0000
Subject: [PATCH] Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs

---
 .eslintignore                                | 3 +++
 mobile/android/app/moz.build                 | 1 +
 mobile/android/installer/package-manifest.in | 1 +
 3 files changed, 5 insertions(+)

diff --git a/.eslintignore b/.eslintignore
index 2fc0d61fabe5e..e8dbe3a037a36 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -227,6 +227,9 @@ media/webrtc/trunk/**
 # mobile/android/ exclusions
 mobile/android/tests/browser/chrome/tp5/**
 
+# uses `#include`
+mobile/android/app/000-tor-browser-android.js
+
 # Uses `#filter substitution`
 mobile/android/app/mobile.js
 mobile/android/app/geckoview-prefs.js
diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build
index 8ff152f3b369d..773c1a3979a82 100644
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -49,6 +49,7 @@ if CONFIG['MOZ_PKG_SPECIAL']:
     DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']
 
 JS_PREFERENCE_PP_FILES += [
+     '000-tor-browser-android.js',
      'geckoview-prefs.js',
      'mobile.js',
 ]
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 3d014cbc6e672..2002a894fc518 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -168,6 +168,7 @@
 #ifdef MOZ_GECKOVIEW_JAR
 @BINPATH@/@PREF_DIR@/geckoview-prefs.js
 #else
+@BINPATH@/@PREF_DIR@/000-tor-browser-android.js
 @BINPATH@/@PREF_DIR@/mobile.js
 #endif
 @BINPATH@/@PREF_DIR@/channel-prefs.js
-- 
GitLab