This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-1 in repository tor-browser.
The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-1 by this push: new 80d85a588080 fixup! Base Browser's .mozconfigs. 80d85a588080 is described below
commit 80d85a588080fd31df96773fb2e2c0019e1c6752 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Oct 27 15:11:21 2022 +0200
fixup! Base Browser's .mozconfigs. --- browser/config/mozconfigs/base-browser | 4 ++++ browser/config/mozconfigs/base-browser-android | 7 +++++-- mozconfig-linux-x86_64-dev | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/browser/config/mozconfigs/base-browser b/browser/config/mozconfigs/base-browser index 82b224f43ed1..064685670934 100644 --- a/browser/config/mozconfigs/base-browser +++ b/browser/config/mozconfigs/base-browser @@ -37,3 +37,7 @@ ac_add_options --enable-base-browser
# Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= + +if test -z "$WASI_SYSROOT"; then + ac_add_options --without-wasm-sandboxed-libraries +fi diff --git a/browser/config/mozconfigs/base-browser-android b/browser/config/mozconfigs/base-browser-android index 744485d846f6..78c5e4c3c08e 100644 --- a/browser/config/mozconfigs/base-browser-android +++ b/browser/config/mozconfigs/base-browser-android @@ -36,11 +36,14 @@ ac_add_options --enable-base-browser # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING=
-if test ! -z "$LOCAL_DEV_BUILD"; then - ac_add_options --without-wasm-sandboxed-libraries +if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default else # We only use beta GeckoView for now, for official builds ac_add_options --enable-update-channel=beta fi + +if test -z "$WASI_SYSROOT"; then + ac_add_options --without-wasm-sandboxed-libraries +fi diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev index af79d8699d71..9740e0c92de9 100644 --- a/mozconfig-linux-x86_64-dev +++ b/mozconfig-linux-x86_64-dev @@ -11,7 +11,5 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --disable-strip ac_add_options --disable-install-strip
-ac_add_options --without-wasm-sandboxed-libraries - ac_add_options --disable-tor-browser-update ac_add_options --with-tor-browser-version=dev-build