Revert "TB3: Tor Browser's official .mozconfigs."

Part of 41584.

This reverts commit b721a1e2.

browser/base/moz.build

@@ -87,9 +87,6 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]:
     # Impacts `/toolkit/content/license.html`.
     DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True
 
-if CONFIG["TOR_BROWSER_UPDATE"]:
-    DEFINES["TOR_BROWSER_UPDATE"] = 1
-
 JAR_MANIFESTS += ["jar.mn"]
 
 GeneratedFile(

browser/config/mozconfigs/base-browser

@@ -41,3 +41,5 @@ ac_add_options MOZ_TELEMETRY_REPORTING=
 if test -z "$WASI_SYSROOT"; then
     ac_add_options --without-wasm-sandboxed-libraries
 fi
+
+ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser

browser/config/mozconfigs/tor-browser

-. $topsrcdir/browser/config/mozconfigs/base-browser
-
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-
-ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser
-# This is not needed with the relative data directory, but it is when you
-# disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla" on
-# Unix systems.
-# It is used, for example, for GetProductDirectory.
-# ac_add_options --with-user-appdir=TorProject
-# ac_add_options --with-user-appdir=.torproject
-
-ac_add_options --enable-tor-browser-update
-
-ac_add_options --with-distribution-id=org.torproject

browser/config/mozconfigs/tor-browser-android

-. $topsrcdir/browser/config/mozconfigs/base-browser-android
-
-mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
-
-ac_add_options --disable-tor-browser-update
-ac_add_options --disable-verify-mar
-
-if test ! -z "$LOCAL_DEV_BUILD"; then
-    ac_add_options --with-tor-browser-version=dev-build
-fi

browser/installer/Makefile.in

@@ -82,10 +82,6 @@ endif
 endif
 endif
 
-ifdef TOR_BROWSER_UPDATE
-DEFINES += -DTOR_BROWSER_UPDATE
-endif
-
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 DEFINES += -DMOZ_SHARED_MOZGLUE=1
 endif

browser/moz.configure

@@ -5,11 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option("MOZ_PLACES", True)
-imply_option("MOZ_SERVICES_HEALTHREPORT", False)
+imply_option("MOZ_SERVICES_HEALTHREPORT", True)
 imply_option("MOZ_SERVICES_SYNC", True)
-imply_option("MOZ_DEDICATED_PROFILES", False)
-imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False)
-imply_option("MOZ_NORMANDY", False)
+imply_option("MOZ_DEDICATED_PROFILES", True)
+imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
+imply_option("MOZ_NORMANDY", True)
 
 with only_when(target_is_linux & compile_environment):
     option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")

mobile/android/confvars.sh

@@ -15,11 +15,3 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 MOZ_RAW=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
-
-### Tor Browser for Android ###
-
-# Disable telemetry at compile-time
-unset MOZ_TELEMETRY_REPORTING
-
-# Disable data reporting at compile-time
-unset MOZ_DATA_REPORTING

mobile/android/geckoview/build.gradle

@@ -46,7 +46,6 @@ android {
         buildConfigField 'String', "MOZ_APP_DISPLAYNAME", "\"${mozconfig.substs.MOZ_APP_DISPLAYNAME}\"";
         buildConfigField 'String', "MOZ_APP_UA_NAME", "\"${mozconfig.substs.MOZ_APP_UA_NAME}\"";
         buildConfigField 'String', "MOZ_UPDATE_CHANNEL", "\"${mozconfig.substs.MOZ_UPDATE_CHANNEL}\"";
-        buildConfigField 'String', "TOR_BROWSER_VERSION", "\"${mozconfig.substs.TOR_BROWSER_VERSION}\"";
 
         // MOZILLA_VERSION is oddly quoted from autoconf, but we don't have to handle it specially in Gradle.
         buildConfigField 'String', "MOZILLA_VERSION", "\"${mozconfig.substs.MOZILLA_VERSION}\"";

mobile/android/moz.configure

@@ -13,7 +13,7 @@ project_flag(
 project_flag(
     "MOZ_ANDROID_HLS_SUPPORT",
     help="Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)",
-    default=False,
+    default=True,
 )
 
 option(
@@ -58,10 +58,7 @@ option(
 set_config("MOZ_ANDROID_GECKOVIEW_LITE", True, when="--enable-geckoview-lite")
 
 imply_option("MOZ_NORMANDY", False)
-# Comment this 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_SERVICES_HEALTHREPORT", True)
 imply_option("MOZ_ANDROID_HISTORY", True)
 imply_option("--enable-small-chunk-size", True)
 
@@ -80,8 +77,6 @@ def check_target(target):
         )
 
 
-include("torbrowser.configure")
-
 include("../../toolkit/moz.configure")
 include("../../build/moz.configure/android-sdk.configure")
 include("../../build/moz.configure/java.configure")

mobile/android/torbrowser.configure

-# -*- 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
-
-imply_option("MOZ_ANDROID_EXCLUDE_FONTS", 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.
-# XXX: no confvars.sh here
-# imply_option("MOZ_TELEMETRY_REPORTING", False)
-# imply_option("MOZ_DATA_REPORTING", False)
-
-imply_option("MOZ_ANDROID_NETWORK_STATE", False)
-imply_option("MOZ_ANDROID_LOCATION", False)

moz.configure

@@ -1044,69 +1044,6 @@ def relative_data_dir(value, target):
 set_define("RELATIVE_DATA_DIR", relative_data_dir)
 
 
-# Tor additions.
-
-option(
-    "--with-tor-browser-version",
-    nargs=1,
-    help="Set Tor Browser version, e.g., 7.0a1"
-)
-
-
-@depends("--with-tor-browser-version")
-def tor_browser_version(value):
-    if not value:
-        die("--with-tor-browser-version is required for Tor Browser.")
-    return value[0]
-
-
-@depends("--with-tor-browser-version")
-def tor_browser_version_quoted(value):
-    if not value:
-        die("--with-tor-browser-version is required for Tor Browser.")
-    return '"{}"'.format(value[0])
-
-
-set_config("TOR_BROWSER_VERSION", tor_browser_version)
-set_define("TOR_BROWSER_VERSION", tor_browser_version)
-set_define("TOR_BROWSER_VERSION_QUOTED", tor_browser_version_quoted)
-
-
-option(
-    "--enable-tor-browser-update",
-    help="Enable Tor Browser update"
-)
-
-
-@depends("--enable-tor-browser-update")
-def tor_browser_update(value):
-    if value:
-        return True
-
-
-set_config("TOR_BROWSER_UPDATE", tor_browser_update)
-set_define("TOR_BROWSER_UPDATE", tor_browser_update)
-add_old_configure_assignment("TOR_BROWSER_UPDATE", tor_browser_update)
-
-
-option(
-    "--enable-tor-browser-data-outside-app-dir",
-    help="Enable Tor Browser data outside of app directory"
-)
-
-
-@depends("--enable-tor-browser-data-outside-app-dir")
-def tor_browser_data_outside_app_dir(value):
-    if value:
-        return True
-
-
-set_define(
-    "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
-add_old_configure_assignment(
-    "TOR_BROWSER_DATA_OUTSIDE_APP_DIR", tor_browser_data_outside_app_dir)
-
-
 # Please do not add configure checks from here on.
 
 # Fallthrough to autoconf-based configure

mozconfig-android-aarch64

-. $topsrcdir/browser/config/mozconfigs/tor-browser-android
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android
 ac_add_options --target=aarch64-linux-android

mozconfig-android-all

@@ -10,13 +10,14 @@ if test -n "$LOCAL_DEV_BUILD"; then
     # You must use the "default" bogus channel for dev builds
     ac_add_options --enable-update-channel=default
     ac_add_options --without-wasm-sandboxed-libraries
-    ac_add_options --with-tor-browser-version=dev-build
 else
     # We want to have a similar fat .aar versioning as Mozilla and make it clear
     # we are on the beta channel for GeckoView
     ac_add_options --enable-update-channel=beta
 fi
 
+ac_add_options --with-tor-browser-version=dev-build
+
 ac_add_options --with-java-bin-path=$JAVA_HOME/bin
 ac_add_options --with-android-sdk=$ANDROID_HOME
 ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle

mozconfig-android-armv7

-. $topsrcdir/browser/config/mozconfigs/tor-browser-android
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi
 ac_add_options --target=arm-linux-androideabi

mozconfig-android-x86

-. $topsrcdir/browser/config/mozconfigs/tor-browser-android
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android
 ac_add_options --target=i686-linux-android

mozconfig-android-x86_64

-. $topsrcdir/browser/config/mozconfigs/tor-browser-android
+. $topsrcdir/browser/config/mozconfigs/base-browser-android
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android
 ac_add_options --target=x86_64-linux-android

mozconfig-linux-arm

-. $topsrcdir/browser/config/mozconfigs/tor-browser
+. $topsrcdir/browser/config/mozconfigs/base-browser
 
 ac_add_options --target=arm-linux-gnueabihf
 

mozconfig-linux-i686

-. $topsrcdir/browser/config/mozconfigs/tor-browser
+. $topsrcdir/browser/config/mozconfigs/base-browser
 
 ac_add_options --target=i686-linux-gnu
 

mozconfig-linux-x86_64

-. $topsrcdir/browser/config/mozconfigs/tor-browser
+. $topsrcdir/browser/config/mozconfigs/base-browser
 
 ac_add_options --enable-default-toolkit=cairo-gtk3
 

mozconfig-linux-x86_64-asan

-. $topsrcdir/browser/config/mozconfigs/tor-browser
+. $topsrcdir/browser/config/mozconfigs/base-browser
 
 export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"
 export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc"