Verified Commit 541d508c authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

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

Part of 41584.

This reverts commit b721a1e2.
parent a85b5b96

browser/base/moz.build

+0 −3
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
. $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

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
. $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

+0 −4
Original line number Diff line number Diff line
@@ -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