This is an automated email from the git hooks/post-receive script.
pierov pushed a change to branch main in repository builders/tor-browser-build.
from bf61fa9 Bug 40638: Update the update link of nightly builds new 9f5c55f Bug 40640: Extract Gradle in the toolchain setup new b321f2a Bug 23656: Use mozconfigs from tor-browser.git (Geckoview)
The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: projects/android-components/build | 7 +++-- projects/android-toolchain/config | 11 +++++--- projects/application-services/build | 6 ++-- projects/fenix/build | 13 +++++---- projects/geckoview/build | 14 ++++++---- projects/geckoview/config | 13 ++++----- projects/geckoview/mozconfig-android-aarch64 | 42 ---------------------------- projects/geckoview/mozconfig-android-all | 13 --------- projects/geckoview/mozconfig-android-armv7 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86_64 | 42 ---------------------------- projects/tor-android-service/build | 6 ++-- projects/tor-onion-proxy-library/build | 6 ++-- 13 files changed, 44 insertions(+), 213 deletions(-) delete mode 100644 projects/geckoview/mozconfig-android-aarch64 delete mode 100644 projects/geckoview/mozconfig-android-all delete mode 100644 projects/geckoview/mozconfig-android-armv7 delete mode 100644 projects/geckoview/mozconfig-android-x86 delete mode 100644 projects/geckoview/mozconfig-android-x86_64
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main in repository builders/tor-browser-build.
commit 9f5c55f6c018adbaae97f8f1100d7c22c804c043 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Oct 13 15:19:31 2022 +0200
Bug 40640: Extract Gradle in the toolchain setup --- projects/android-components/build | 7 ++++--- projects/android-toolchain/config | 11 +++++++---- projects/application-services/build | 6 ++++-- projects/fenix/build | 13 +++++++------ projects/geckoview/build | 7 ++++--- projects/geckoview/config | 2 -- projects/tor-android-service/build | 6 ++++-- projects/tor-onion-proxy-library/build | 6 ++++-- 8 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/projects/android-components/build b/projects/android-components/build index 68c5057..093ee52 100755 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -1,13 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] distdir=/var/tmp/dist builddir=/var/tmp/build/[% project %] mkdir $distdir/[% project %] mkdir /var/tmp/build
-tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] - cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index a2f34ae..374cf88 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -22,10 +22,13 @@ var: export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %] export NDK_HOST_TAG=linux-x86_64 - export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle - export GRADLE_USER_HOME=$GRADLE_HOME - export PATH=$PATH:$ANDROID_HOME/build-tools/[% c("var/version_31") %]:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin - mkdir -p "$GRADLE_HOME" + export PATH=$PATH:$ANDROID_HOME/build-tools/[% c("var/version_31") %]:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin + [% IF c("gradle_tarfile") -%] + tar -C /var/tmp/dist/[% project %] -xf $rootdir/[% c("gradle_tarfile") %] + export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export GRADLE_USER_HOME=$GRADLE_HOME + export PATH=$PATH:$GRADLE_HOME/bin + [% END -%] google_repo: https://dl.google.com/android/repository android_api_level: 31 android_platform_revision: 01 diff --git a/projects/application-services/build b/projects/application-services/build index d4b1098..810e84c 100755 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -1,12 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] distdir=/var/tmp/dist/[% project %] builddir=/var/tmp/build/[% project %] mkdir $distdir mkdir /var/tmp/build
-tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] cd /var/tmp/dist [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64', 'linux-x86_64'] -%] tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %] diff --git a/projects/fenix/build b/projects/fenix/build index 3306e3d..a16b609 100755 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -1,13 +1,14 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] distdir=/var/tmp/dist builddir=/var/tmp/build/[% project %] mkdir -p $distdir/[% project %] mkdir -p /var/tmp/build
-tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] - cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF @@ -48,7 +49,7 @@ sed -i 's/\"${Config.getGitHash()}\"/\"[% c('abbrev') %]\"/' app/build.gradl # XXX We need the build variant in lower case. Do something smarter here. v=[% c("variant") %] [% IF c("var/fetch_gradle_dependencies") %] - $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] \ + $GRADLE_HOME/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] \ app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization \ > gradle.log 2>&1 \ || ( cat gradle.log; exit 1 ) @@ -85,8 +86,8 @@ v=[% c("variant") %] version_name='[% c("var/fenix_version") %]-[% c("variant") %] ([% c("var/torbrowser_version") %])' # We need -PdisableOptimization for building tests. See: # https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40... - $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint -PtestBuildType=${v,} - $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization + $GRADLE_HOME/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint -PtestBuildType=${v,} + $GRADLE_HOME/bin/gradle --offline --no-daemon -PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk $distdir/[% project %]
diff --git a/projects/geckoview/build b/projects/geckoview/build index df8ef7c..5d2b26a 100755 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -1,12 +1,13 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] distdir=/var/tmp/dist mkdir -p /var/tmp/build mkdir -p $distdir/[% project %]
-tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] - # We need to have the get-moz-build-date script available in the container # but we can't include it via input_files as it is a script shared between # projects. diff --git a/projects/geckoview/config b/projects/geckoview/config index a1c6244..8aec9be 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -41,8 +41,6 @@ steps: mkdir -p /var/tmp/build mkdir -p $distdir/[% project %]
- tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] - cat > get-moz-build-date << "EOF" [% INCLUDE "get-moz-build-date" %] EOF diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 4bdab9c..f59f0e5 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -9,8 +9,10 @@ cp -r $gradle_repo/maven2/* $gradle_repo
mkdir -p /var/tmp/build $output_dir
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz unzip -d $rootdir $rootdir/[% c('input_files_by_name/jetifier') %]
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 5916fd5..c13c556 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -11,8 +11,10 @@ cp -r $gradle_repo/maven2/* $gradle_repo
mkdir -p /var/tmp/build $output_dir
-[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %] +[% pc(c('var/compiler'), 'var/setup', { + compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), + gradle_tarfile => c("input_files_by_name/gradle"), + }) %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
# Patch projects
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main in repository builders/tor-browser-build.
commit b321f2a1317eeb3777d34c8c0f8f01b1c9d628c1 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Mon Oct 10 17:39:27 2022 +0200
Bug 23656: Use mozconfigs from tor-browser.git (Geckoview) --- projects/geckoview/build | 7 +++-- projects/geckoview/config | 11 ++++---- projects/geckoview/mozconfig-android-aarch64 | 42 ---------------------------- projects/geckoview/mozconfig-android-all | 13 --------- projects/geckoview/mozconfig-android-armv7 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86 | 42 ---------------------------- projects/geckoview/mozconfig-android-x86_64 | 42 ---------------------------- 7 files changed, 10 insertions(+), 189 deletions(-)
diff --git a/projects/geckoview/build b/projects/geckoview/build index 5d2b26a..faaf0a9 100755 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -27,7 +27,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c("version") %] -mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig +ln -s mozconfig-[% c("var/osname") %] .mozconfig
eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] @@ -53,7 +53,10 @@ rm -f js/src/configure export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" -./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries +./mach configure \ + --with-tor-browser-version=[% c("var/torbrowser_version") %] \ + [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] + ./mach build --verbose
# We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name. diff --git a/projects/geckoview/config b/projects/geckoview/config index 8aec9be..9862fc6 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -63,7 +63,7 @@ steps: export MOZ_ANDROID_FAT_AAR_X86_64=$builddir/geckoview/*x86_64*.aar
cd $builddir/[% project %]-[% c("version") %] - mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig + ln -s mozconfig-android-all .mozconfig
eval $(perl $rootdir/get-moz-build-date [% c("var/copyright_year") %] [% c("var/torbrowser_version") %]) if [ -z $MOZ_BUILD_DATE ] @@ -84,7 +84,10 @@ steps: # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" # We still need to specify --tor-browser-version due to bug 34005. - ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries + ./mach configure \ + --with-tor-browser-version=[% c("var/torbrowser_version") %] \ + [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] + ./mach build --verbose find obj-* -regex '.*geckoview.*omni.*(aar|pom)' -exec cp {} $distdir/[% project %] ;
@@ -107,8 +110,6 @@ steps: - project: node name: node pkg_type: build - - filename: mozconfig-android-all - name: mozconfig - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' @@ -152,8 +153,6 @@ input_files: project: '[% c("var/compiler") %]' - project: gradle name: gradle - - filename: 'mozconfig-[% c("var/osname") %]' - name: mozconfig - project: binutils name: binutils - project: rust diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 deleted file mode 100644 index 4facc9a..0000000 --- a/projects/geckoview/mozconfig-android-aarch64 +++ /dev/null @@ -1,42 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -ac_add_options --disable-tor-browser-update -ac_add_options --disable-verify-mar - -# We only use beta GeckoView for now; use default for local builds -ac_add_options --enable-update-channel=beta - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/geckoview/mozconfig-android-all b/projects/geckoview/mozconfig-android-all deleted file mode 100644 index 934b689..0000000 --- a/projects/geckoview/mozconfig-android-all +++ /dev/null @@ -1,13 +0,0 @@ -export MOZILLA_OFFICIAL=1 - -ac_add_options --enable-application=mobile/android -ac_add_options --disable-compile-environment -# 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 - -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 deleted file mode 100644 index 2465ae3..0000000 --- a/projects/geckoview/mozconfig-android-armv7 +++ /dev/null @@ -1,42 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-arm-linux-androideabi -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -ac_add_options --disable-tor-browser-update -ac_add_options --disable-verify-mar - -# We only use beta GeckoView for now; use default for local builds -ac_add_options --enable-update-channel=beta - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 deleted file mode 100644 index 884d735..0000000 --- a/projects/geckoview/mozconfig-android-x86 +++ /dev/null @@ -1,42 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-i386-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -ac_add_options --disable-tor-browser-update -ac_add_options --disable-verify-mar - -# We only use beta GeckoView for now; use default for local builds -ac_add_options --enable-update-channel=beta - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 deleted file mode 100644 index 74f4fba..0000000 --- a/projects/geckoview/mozconfig-android-x86_64 +++ /dev/null @@ -1,42 +0,0 @@ -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-x86_64-linux-android -mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -export MOZILLA_OFFICIAL=1 -CC="clang" -CXX="clang++" - -ac_add_options --with-android-min-sdk=21 - -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd -ac_add_options --enable-official-branding - -ac_add_options --enable-application=mobile/android -ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d -ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux -ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle - -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - -# We do not use Tor Launcher on Android: -ac_add_options --disable-tor-launcher - -ac_add_options --disable-tor-browser-update -ac_add_options --disable-verify-mar - -# We only use beta GeckoView for now; use default for local builds -ac_add_options --enable-update-channel=beta - -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-debug -ac_add_options --disable-rust-debug -ac_add_options --disable-crashreporter -ac_add_options --disable-webrtc -ac_add_options --disable-parental-controls - -ac_add_options --enable-proxy-bypass-protection - -# Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING=
tor-commits@lists.torproject.org