From 31c56bf4d5fddcdc7c5b76c4550c9de2b5205deb Mon Sep 17 00:00:00 2001
From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Mon, 22 Jan 2018 11:18:45 +0000
Subject: [PATCH] Bug 25741 - TBA: Add default configure options in dedicated
 file

---
 mobile/android/moz.configure        |  9 ++++--
 mobile/android/torbrowser.configure | 43 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 mobile/android/torbrowser.configure

diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 034810e966dc4..df9eb20380754 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -112,9 +112,12 @@ option(env='MOZ_ANDROID_MOZILLA_ONLINE',
 set_config('MOZ_ANDROID_MOZILLA_ONLINE',
            depends_if('MOZ_ANDROID_MOZILLA_ONLINE')(lambda _: True))
 
-imply_option('MOZ_SERVICES_HEALTHREPORT', True)
-imply_option('MOZ_ANDROID_HISTORY', True)
 imply_option('--enable-small-chunk-size', True)
+# Comment these so we can imply |False| in torbrowser.configure
+# The Build system doesn't allow multiple imply_option()
+# calls with the same key.
+#imply_option('MOZ_SERVICES_HEALTHREPORT', True)
+#imply_option('MOZ_ANDROID_HISTORY', True)
 
 set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
 add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0')
@@ -128,6 +131,8 @@ def check_target(target):
             'Build_Instructions/Simple_Firefox_for_Android_build '
             'for more information about the necessary options.')
 
+include('torbrowser.configure')
+
 include('../../toolkit/moz.configure')
 include('../../build/moz.configure/java.configure')
 include('gradle.configure')
diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure
new file mode 100644
index 0000000000000..5e3ab67dca6a9
--- /dev/null
+++ b/mobile/android/torbrowser.configure
@@ -0,0 +1,43 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+# Set Tor Browser default config
+
+# Disable Android Beam (NFC integration)
+imply_option('MOZ_ANDROID_BEAM', False)
+
+
+imply_option('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE', False)
+imply_option('MOZ_ANDROID_DOWNLOADS_INTEGRATION', False)
+imply_option('MOZ_ANDROID_EXCLUDE_FONTS', False)
+
+# Disable push notifications/messaging on nightly
+imply_option('MOZ_ANDROID_GCM', False)
+
+# Disable all history/bookmark/icon caching
+# (both in local sqlite DB and with Android integration)
+imply_option('MOZ_ANDROID_HISTORY', False)
+imply_option('MOZ_PLACES', False)
+
+# Disable the stumbler, Firefox shouldn't touch the network
+imply_option('MOZ_ANDROID_MLS_STUMBLER', False)
+
+# Disable uploading crash reports and dump files to an external server
+# This is still configured in old-configure. Uncomment when this moves
+# to the python config
+#imply_option('MOZ_CRASHREPORTER', False)
+
+# Disable uploading information about the browser configuration and
+# performance to an external server
+imply_option('MOZ_SERVICES_HEALTHREPORT', False)
+
+# Disable creating telemetry and data reports that are uploaded to an
+# external server
+# These aren't actually configure options. These are disabled in
+# confvars.sh, but they look like configure options so we'll document
+# them here, as well.
+#imply_option('MOZ_TELEMETRY_REPORTING', False)
+#imply_option('MOZ_DATA_REPORTING', False)
-- 
GitLab