[tbb-commits] [builders/tor-browser-build] 02/02: Bug 23656: Use mozconfigs from tor-browser.git (Geckoview)

gitolite role git at cupani.torproject.org
Mon Oct 17 07:15:41 UTC 2022 

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 at 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=

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the tbb-commits mailing list