[builders/tor-browser-build] branch master updated (da516e6 -> 8e438a4)

List overview All Threads
Download

newer

older

[tor-browser] branch...

[torspec] branch main updated:...

gitolite role

22 Apr 2022 22 Apr '22

1:41 p.m.

This is an automated email from the git hooks/post-receive script.

boklm pushed a change to branch master in repository builders/tor-browser-build.

from da516e6 Bug 40414: Add finished-signing-clean-* new 2b8da52 Bug 40446: Update components for mozilla99: Make component update list new a38c41d Bug 40446: Update components for mozilla99: glean part new 4d92b78 Bug 40446: Update components for mozilla99: application-services part new 6099bbb Bug 40446: Update components for mozilla99: android-components part new 4a9a9c9 Bug 40446: Update components for mozilla99: fenix part new b74ca3a Bug 40433: Bumped LLVM to 13.0.1 for android builds new 35ac70b Bug 40446: Update components for mozilla99: geckoview part new 8e438a4 Bug 40202: Sign Fenix QA apks with the latest version of apksign

The 8 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: Makefile | 11 +- projects/android-components/build | 5 +- projects/android-components/config | 8 +- .../gradle-dependencies-list.txt | 180 ++--- projects/android-toolchain/build | 9 +- projects/android-toolchain/config | 16 +- projects/application-services/build | 11 +- projects/application-services/config | 15 +- .../gradle-dependencies-list.txt | 272 +++---- projects/application-services/mavenLocal.patch | 30 +- projects/cbindgen/config | 3 + projects/clang/build | 38 + projects/clang/config | 2 +- projects/fenix/build | 9 +- projects/fenix/config | 8 +- projects/fenix/gradle-dependencies-list.txt | 548 +++++++------- projects/geckoview/build | 7 +- projects/geckoview/config | 18 +- projects/geckoview/gradle-dependencies-list.txt | 791 ++++++++++++--------- projects/geckoview/list_toolchain_updates_checks | 14 +- projects/geckoview/mozconfig-android-aarch64 | 5 +- projects/geckoview/mozconfig-android-armv7 | 7 +- projects/geckoview/mozconfig-android-x86 | 7 +- projects/geckoview/mozconfig-android-x86_64 | 5 +- projects/glean/config | 4 +- projects/gradle/config | 1 + projects/llvm-project/config | 18 +- projects/lucetc/config | 3 + projects/rust/config | 4 +- projects/tor-browser/build.android | 5 +- projects/tor-browser/config | 6 +- projects/uniffi-rs/config | 3 + rbm.conf | 17 +- 33 files changed, 1137 insertions(+), 943 deletions(-) mode change 100644 => 100755 projects/android-toolchain/build mode change 100644 => 100755 projects/application-services/build mode change 100644 => 100755 projects/geckoview/build

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

Show replies by date

gitolite role

22 Apr 22 Apr

1:41 p.m.

New subject: [builders/tor-browser-build] 01/08: Bug 40446: Update components for mozilla99: Make component update list

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 2b8da52b49a4ad9df23cc3a8b755904d4ee51426 Author: aguestuser aguestuser@torproject.org AuthorDate: Thu Mar 17 16:00:34 2022 -0400

Bug 40446: Update components for mozilla99: Make component update list --- projects/android-components/config | 2 +- projects/application-services/config | 2 +- projects/fenix/config | 2 +- projects/geckoview/config | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config index 7011894..1a67bfc 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -57,7 +57,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: releases/96.0 + git_hash: releases/99.0 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index 76d2896..f98f5f3 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -100,7 +100,7 @@ input_files:

steps: list_toolchain_updates: - git_hash: 'v86.2.2' + git_hash: 'v91.1.0' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index 7a5c972..b55be94 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -59,7 +59,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/fenix.git - git_hash: releases_v96.0.0 + git_hash: releases_v99.0.0 #tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index e6bef5c..f3527ce 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -135,7 +135,7 @@ steps:

list_toolchain_updates: git_url: https://github.com/mozilla/gecko-dev.git - git_hash: release + git_hash: beta tag_gpg_id: 0 input_files: [] var:

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 02/08: Bug 40446: Update components for mozilla99: glean part

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit a38c41d2a82e904a4b9d4ace70b3df4dfd0365a8 Author: aguestuser aguestuser@torproject.org AuthorDate: Thu Mar 17 18:21:46 2022 -0400

Bug 40446: Update components for mozilla99: glean part --- projects/glean/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/glean/config b/projects/glean/config index 939ae51..e65e28f 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -23,16 +23,18 @@ var: 4.0.0: c974113bd8671364c592fea9b64bac660b59d4f03a7dcecd4dd4e0c355431db8 4.2.0: 09cda9fb155e4987bdc03b702219960e9729c448146f023f8c93de57836edf31 4.4.0: afc0eb6497413eab8e5cf95cf9bbfe4dc1cc53a208b9b66572cfde752f3023e9 + 5.0.1: 289b843af3d0f4bd5fbdc77c94c7e1b2830bcbbf7e43786d30b2bd02f85b4a1a glean_wheels_url: 3.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-3.4.0-buil... 4.0.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.0.0.tar.... 4.2.0: https://people.torproject.org/~pierov/tbb_files/glean-wheels-4.2.0.tar.xz 4.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.4.0.tar.... + 5.0.1: https://people.torproject.org/~aguestuser/mirrors/sources/glean-wheels-5.0.1...

steps: create_glean_deps_tarball: git_url: '' - version: 4.4.0 + version: 5.0.1 filename: 'glean-wheels-[% c("version") %].tar.xz' build_log: '-' var:

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 03/08: Bug 40446: Update components for mozilla99: application-services part

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 4d92b7876cf3c7842cf9f71d35b2f8177b8d0225 Author: aguestuser aguestuser@torproject.org AuthorDate: Fri Mar 18 17:17:25 2022 -0400

Bug 40446: Update components for mozilla99: application-services part --- Makefile | 11 +- projects/android-toolchain/build | 5 + projects/application-services/build | 11 +- projects/application-services/config | 13 +- .../gradle-dependencies-list.txt | 272 ++++++++++----------- projects/application-services/mavenLocal.patch | 30 ++- projects/cbindgen/config | 3 + projects/lucetc/config | 3 + projects/uniffi-rs/config | 3 + rbm.conf | 10 +- 10 files changed, 198 insertions(+), 163 deletions(-)

diff --git a/Makefile b/Makefile index bf0b63b..c4b14ee 100644 --- a/Makefile +++ b/Makefile @@ -250,19 +250,19 @@ get_gradle_dependencies_list-android-components: submodule-update $(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7

cargo_vendor-application-services: submodule-update - $(rbm) build application-services --step cargo_vendor --target nightly + $(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7

cargo_vendor-cbindgen-android: submodule-update - $(rbm) build cbindgen --step cargo_vendor --target nightly --target android + $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-android-armv7

cargo_vendor-cbindgen: submodule-update - $(rbm) build cbindgen --step cargo_vendor --target nightly + $(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64

cargo_vendor-lucetc: submodule-update - $(rbm) build lucetc --step cargo_vendor --target nightly + $(rbm) build lucetc --step cargo_vendor --target nightly --target torbrowser-linux-x86_64

cargo_vendor-uniffi-rs: submodule-update - $(rbm) build uniffi-rs --step cargo_vendor --target nightly + $(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64

submodule-update: git submodule update --init @@ -275,4 +275,3 @@ clean: submodule-update

clean-dry-run: submodule-update ./tools/clean-old --dry-run - diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build old mode 100644 new mode 100755 index ab47fb3..b29ffee --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -41,6 +41,11 @@ unzip -qq $HOME/[% c("input_files_by_name/build_tools_28") %] -d $SDK_HOME mkdir -p build-tools/[% c("var/version_28") %] mv [% c("var/android_release_dir_28") %]/* build-tools/[% c("var/version_28") %]

+# Application Services currently needs build tools 30.0.2 +unzip -qq $HOME/[% c("input_files_by_name/build_tools_30") %] -d $SDK_HOME +mkdir -p build-tools/[% c("var/version_30") %] +mv [% c("var/android_release_dir_30") %]/* build-tools/[% c("var/version_30") %] + unzip -qq $HOME/[% c("input_files_by_name/build_tools_29") %] -d $SDK_HOME mkdir -p build-tools/[% c("var/version_29") %] mv [% c("var/android_release_dir_29") %]/* build-tools/[% c("var/version_29") %] diff --git a/projects/application-services/build b/projects/application-services/build old mode 100644 new mode 100755 index 8e386f5..f526973 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -19,7 +19,7 @@ tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %] export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH cd $rootdir

-export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 +export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64

[% IF !c('var/fetch_gradle_dependencies') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] @@ -95,8 +95,15 @@ export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3 gradle $gradle_flags assembleRelease gradle $gradle_flags publish

- cd build + pushd components/support/nimbus-fml + cargo build --release + popd + + pushd build find maven -regex '.*[0-9].(aar|pom)' -exec cp --parents {} $distdir ; + popd + + cp target/release/nimbus-fml $distdir

cd /var/tmp/dist [% c('tar', { diff --git a/projects/application-services/config b/projects/application-services/config index f98f5f3..29a6084 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: 86.2.2 -git_hash: 8c36c7c49e577b92af9328577ccae6795c3b909d +version: 91.1.1 +git_hash: 17942945873cdb8be56a9316d3cb8a611b3ef321 git_url: https://github.com/mozilla/application-services git_submodule: 1

+--- + build.gradle | 2 ++ + settings.gradle | 7 +++++++ + 2 files changed, 9 insertions(+)

diff --git a/build.gradle b/build.gradle -index 4715a7cd..1e71ca04 100644 +index 8e78d9af..635f0740 100644 --- a/build.gradle +++ b/build.gradle -@@ -17,6 +17,7 @@ buildscript { +@@ -38,6 +38,7 @@ buildscript { ]

repositories { + mavenLocal() + mavenCentral() google() jcenter() - maven { -@@ -57,6 +58,7 @@ apply plugin: 'de.undercouch.download' +@@ -90,6 +91,7 @@ apply plugin: 'de.undercouch.download'

allprojects { repositories { @@ -25,22 +29,22 @@ index 4715a7cd..1e71ca04 100644 jcenter() maven { diff --git a/settings.gradle b/settings.gradle -index 2349f829..f0ad1ef9 100644 +index 2349f829..5d9ceb85 100644 --- a/settings.gradle +++ b/settings.gradle -@@ -1,6 +1,11 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public +@@ -2,12 +2,19 @@ * 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/. */ + +pluginManagement { + repositories { + mavenLocal() + } +} - ++ import org.yaml.snakeyaml.Yaml buildscript { -@@ -8,6 +13,7 @@ buildscript { + dependencies { classpath 'org.yaml:snakeyaml:1.23' } repositories { @@ -49,5 +53,5 @@ index 2349f829..f0ad1ef9 100644 } } -- -2.27.0 +2.32.0

diff --git a/projects/cbindgen/config b/projects/cbindgen/config index bc52920..ec44731 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -28,3 +28,6 @@ steps: input_files: - project: container-image pkg_type: build + - project: rust + name: rust + pkg_type: build diff --git a/projects/lucetc/config b/projects/lucetc/config index 8de3a8e..f2d556c 100644 --- a/projects/lucetc/config +++ b/projects/lucetc/config @@ -39,3 +39,6 @@ steps: input_files: - project: container-image pkg_type: build + - project: rust + name: rust + pkg_type: build diff --git a/projects/uniffi-rs/config b/projects/uniffi-rs/config index c8ad51c..0c55e5b 100644 --- a/projects/uniffi-rs/config +++ b/projects/uniffi-rs/config @@ -23,3 +23,6 @@ steps: input_files: - project: container-image pkg_type: build + - project: rust + name: rust + pkg_type: build diff --git a/rbm.conf b/rbm.conf index 37b95e2..adeacfb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -28,12 +28,20 @@ steps: arch: amd64 pre_pkginst: '' deps: - - cargo - patch - bzip2 cargo_vendor: | #!/bin/bash [% c("var/set_default_env") %] + mkdir /var/tmp/dist + # NOTE: since different projects need different rust versions, + # we use the version of cargo produced by the rust project + # build rather than the build container's debian package. + # Thus, any project that wants to run a `cargo_vendor` step + # must be sure to provide the rust project as an `input_file`. + # See, e.g.,`application-services/config.steps.cargo_vendor.input_files`. + tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] + export PATH="/var/tmp/dist/rust/bin:$PATH" tar -xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] [% c("var/pre_cargo_vendor") %]

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 04/08: Bug 40446: Update components for mozilla99: android-components part

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 6099bbb983e1b5c1364ac79eec038d713c54ee4d Author: aguestuser aguestuser@torproject.org AuthorDate: Fri Mar 18 17:18:18 2022 -0400

Bug 40446: Update components for mozilla99: android-components part --- projects/android-components/build | 5 +- projects/android-components/config | 6 +- .../gradle-dependencies-list.txt | 180 +++++++++++---------- 3 files changed, 104 insertions(+), 87 deletions(-)

diff --git a/projects/android-components/build b/projects/android-components/build index 1199cb0..85ac597 100755 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -18,7 +18,7 @@ EOF # This overwrites the release, beta, and nightly geckoview .aar files in our # gradle-dependencies directory to be sure that only the one we provide is # getting used when building beta/release code. - find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} ; + find $gradle_repo -type f -name geckoview*omni*.aar -exec cp -f $distdir/geckoview/geckoview*omni*.aar {} ; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -64,7 +64,8 @@ sed -i 's/tag = getGitHash()/tag = "[% c('abbrev') %]"/' publish.gradle exit 1 fi

- gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo" + # Increase the maximum memory usage, for when compiling with --disable-install-strip + gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo -Dorg.gradle.jvmargs=-Xmx8g"

gradle $gradle_args assembleGecko -x lint gradle $gradle_args publish diff --git a/projects/android-components/config b/projects/android-components/config index 1a67bfc..dedbb0e 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,14 +8,14 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 05/08: Bug 40446: Update components for mozilla99: fenix part

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 4a9a9c94511a702dc1daeae5bda0a836cbff08f0 Author: aguestuser aguestuser@torproject.org AuthorDate: Fri Mar 18 17:18:37 2022 -0400

Bug 40446: Update components for mozilla99: fenix part --- projects/fenix/build | 9 +- projects/fenix/config | 6 +- projects/fenix/gradle-dependencies-list.txt | 548 ++++++++++++++-------------- 3 files changed, 286 insertions(+), 277 deletions(-)

diff --git a/projects/fenix/build b/projects/fenix/build index 26aa9da..1c1890f 100755 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -18,7 +18,7 @@ EOF # This overwrites the release, beta, and nightly geckoview .aar files in our # gradle-dependencies directory to be sure that only the one we provide is # getting used when building beta/release code. - find $gradle_repo -type f -name geckoview*.aar -exec cp -f $distdir/geckoview/geckoview*.aar {} ; + find $gradle_repo -type f -name geckoview*omni*.aar -exec cp -f $distdir/geckoview/geckoview*omni*.aar {} ; cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -28,6 +28,9 @@ EOF cp -rf $distdir/application-services/maven/org $gradle_repo tar -C $distdir -xf [% c('input_files_by_name/android-components') %] cp -rf $distdir/android-components/maven/org $gradle_repo + nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus + mkdir -p $nimbusdir + cp $distdir/application-services/nimbus-fml $nimbusdir/ tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -74,7 +77,9 @@ v=[% c("variant") %] exit 1 fi

- version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version") %]-[% c("variant") %])' + # We put the tor-browser version last to avoid int-parsing errors when consumers of project.versionName + # assume it starts with a major version number, as it does for all Mozilla version names. + 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,} diff --git a/projects/fenix/config b/projects/fenix/config index b55be94..48c00aa 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -8,16 +8,16 @@ gpg_keyring: torbutton.gpg variant: Beta

var: - fenix_version: 96.3.0 + fenix_version: 99.0.0b3 torbrowser_branch: 11.5 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 34 + gradle_dependencies_version: 35 gradle_version: 7.0.2 - glean_parser: 4.2.0 + glean_parser: 5.0.1 arch_deps: - python3-venv

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 06/08: Bug 40433: Bumped LLVM to 13.0.1 for android builds

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit b74ca3addf6719cc8f8170396a8f09f99ae82948 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Apr 21 11:29:23 2022 +0200

Bug 40433: Bumped LLVM to 13.0.1 for android builds --- projects/clang/build | 38 ++++++++++++++++++++++++++++++++++++++ projects/clang/config | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/projects/clang/build b/projects/clang/build index 33c89d5..d913c6d 100644 --- a/projects/clang/build +++ b/projects/clang/build @@ -12,6 +12,9 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH" ln -s gcc /var/tmp/dist/gcc/bin/cc [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] [% END -%] +[% IF c("var/android") %] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% END -%] [% IF c("var/linux") || c("var/android") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" @@ -32,6 +35,41 @@ cmake ../llvm -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;lld" make -j[% c("buildconf/num_procs") %] make install + +[% IF c("var/android") -%] + rtdistdir=/var/tmp/build/rtdist + mkdir $rtdistdir + + make_compilerrt () { + cd .. + mkdir "build-compilerrt-$1" + cd "build-compilerrt-$1" + cmake ../compiler-rt/ -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=$rtdistdir \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_ANDROID_ARCH_ABI=$1 \ + -DCMAKE_ANDROID_NDK="/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d" \ + -DCMAKE_C_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ + -DCMAKE_CXX_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ + -DCMAKE_EXE_LINKER_FLAGS="-L/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/$2" \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_MEMPROF=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF + make -j[% c("buildconf/num_procs") %] + make install + } + + make_compilerrt "armeabi-v7a" "arm-linux-androideabi/lib" "-DARMEABI_V7A" + make_compilerrt "arm64-v8a" "aarch64-linux-android/lib64" + make_compilerrt "x86" "i686-linux-android/lib" + make_compilerrt "x86_64" "x86_64-linux-android/lib64" + + mv $rtdistdir/lib/android/*.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ +[% END -%] + cd /var/tmp/dist [% c('tar', { tar_src => [ project ], diff --git a/projects/clang/config b/projects/clang/config index aeefc7a..0524420 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -11,7 +11,7 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") %]' + enable: '[% c("var/linux") || c("var/android") %]' - name: binutils project: binutils enable: '[% c("var/linux") || c("var/android") %]'

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 07/08: Bug 40446: Update components for mozilla99: geckoview part

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 35ac70b0c64316e57b9f7e2022b77c065ca7c514 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Mar 22 16:10:31 2022 +0100

Bug 40446: Update components for mozilla99: geckoview part

Partially fixes also #40433, as it bumps Clang to version 13.0.1. However, we may want to see if we can compile compiler-rt with the Clang that we compile, instead of using the NDK's compiler. --- projects/android-toolchain/build | 4 +- projects/android-toolchain/config | 14 +- projects/geckoview/build | 7 +- projects/geckoview/config | 16 +- projects/geckoview/gradle-dependencies-list.txt | 791 +++++++++++++---------- projects/geckoview/list_toolchain_updates_checks | 14 +- projects/geckoview/mozconfig-android-aarch64 | 5 +- projects/geckoview/mozconfig-android-armv7 | 7 +- projects/geckoview/mozconfig-android-x86 | 7 +- projects/geckoview/mozconfig-android-x86_64 | 5 +- projects/gradle/config | 1 + projects/llvm-project/config | 18 +- projects/rust/config | 4 +- rbm.conf | 7 +- 14 files changed, 495 insertions(+), 405 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index b29ffee..5c01b76 100755 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -27,8 +27,8 @@ done # Tool Archives cd $SDK_HOME unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME -mkdir -p build-tools/[% c("var/version_30") %] -mv [% c("var/android_release_dir_30") %]/* build-tools/[% c("var/version_30") %] +mkdir -p build-tools/[% c("var/version_31") %] +mv [% c("var/android_release_dir") %]/* build-tools/[% c("var/version_31") %]

unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME mkdir -p platforms/android-[% c("var/android_api_level") %] diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index a964f7d..8aa5e22 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -1,7 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]' +version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[% c("var/version_30") %]+[% c("var/version_31") %]' var: + version_31: 31.0.0 version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 @@ -44,12 +45,15 @@ var: # but it seems sdk-tools is still being used in the build, so we can't # remove sdk-tools yet. sdk_tools_version: 4333796 - commandlinetools_version: 7302050 - commandlinetools_version_string: 4.0 + commandlinetools_version: 7583922 + commandlinetools_version_string: 5.0 input_files: - project: container-image - - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' + - URL: '[% c("var/google_repo") %]/build-tools_r31-linux.zip' name: build_tools + sha256sum: f90c22f5562638a2e00762e1711eebd55e7f0a05232b65200d387307d057bfe8 + - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip' + name: build_tools_30 sha256sum: 565af786dc0cc1941002174fb945122eabd080b222cd4c7c3d9a2ae0fabf5dc4 - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_29") %]-linux.zip' name: build_tools_29 @@ -77,7 +81,7 @@ input_files: sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9 - URL: '[% c("var/google_repo") %]/commandlinetools-linux-[% c("var/commandlinetools_version") %]_latest.zip' name: android_commandlinetools - sha256sum: 7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622 + sha256sum: 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip' name: android_ndk_compiler sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd diff --git a/projects/geckoview/build b/projects/geckoview/build old mode 100644 new mode 100755 index b83a3e3..1782b12 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -35,7 +35,7 @@ then exit 1 fi

-# We don't want to have the debug .aar but the one that has `$channel`, `$arch`, -# and `$version` in its name. -find obj-* -type f -name geckoview-*-*-*.aar -exec cp {} $distdir/[% project %] ; +# We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name. +find obj-* -type f -name geckoview*omni*.aar -exec cp {} $distdir/[% project %] ;

cd $distdir [% c('tar', { diff --git a/projects/geckoview/config b/projects/geckoview/config index f3527ce..2f57a4a 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg

var: - geckoview_version: 96.0 + geckoview_version: 99.0b3 torbrowser_branch: 11.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -20,11 +20,13 @@ var: - python3 - python3-distutils - pkg-config + - openjdk-11-jdk-headless container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 9 - gradle_version: 6.9.1 + # see doc/how-to-create-gradle-dependencies-list.txt + gradle_dependencies_version: 10 + gradle_version: 7.3

steps: merge_aars: @@ -72,7 +74,7 @@ steps: exit 1 fi

- export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 + export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64 gradle_repo=/var/tmp/dist/gradle-dependencies export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2" export GRADLE_FLAGS="--no-daemon --offline" @@ -86,7 +88,7 @@ steps: # 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 build --verbose - find obj-* -regex '.*geckoview.*[0-9].(aar|pom)' -exec cp {} $distdir/[% project %] ; + find obj-* -regex '.*geckoview.*omni.*(aar|pom)' -exec cp {} $distdir/[% project %] ;

cd $distdir/ [% c('tar', { @@ -144,7 +146,7 @@ steps:

targets: nightly: - git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1' + git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2' tag_gpg_id: 0

@@ -165,12 +165,14 @@ check_update_needed nasm "$needed" "$current" read -d '' p << 'EOF' || true my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/clang.yml'); my $clang_toolchain; -foreach my $t (keys %$d) { - if ($d->{$t}{run}{'toolchain-alias'} eq 'linux64-clang-android-cross') { - foreach my $fetch (@{$d->{$t}{fetches}{toolchain}}) { - $clang_toolchain = $fetch if $fetch =~ m/^.*-clang-.*/; +TOOLCHAIN: foreach my $t (keys %$d) { + foreach my $alias (@{$d->{$t}{run}{'toolchain-alias'}}) { + if ($alias eq 'linux64-clang') { + foreach my $fetch (@{$d->{$t}{fetches}{toolchain}}) { + $clang_toolchain = $fetch if $fetch =~ m/^.*-clang-.*/; + } + last TOOLCHAIN; } - last; } }

diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index e2f9553..4facc9a 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li 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 +# We only use beta GeckoView for now; use default for local builds ac_add_options --enable-update-channel=beta

ac_add_options --enable-strip diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 5feea4e..2465ae3 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -4,7 +4,7 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++"

-ac_add_options --with-android-min-sdk=16 +ac_add_options --with-android-min-sdk=21

ac_add_options --enable-optimize ac_add_options --enable-rust-simd @@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li 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 +# We only use beta GeckoView for now; use default for local builds ac_add_options --enable-update-channel=beta

ac_add_options --enable-strip diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 44243e8..884d735 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -4,7 +4,7 @@ export MOZILLA_OFFICIAL=1 CC="clang" CXX="clang++"

-ac_add_options --with-android-min-sdk=16 +ac_add_options --with-android-min-sdk=21

+# 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 +# We only use beta GeckoView for now; use default for local builds ac_add_options --enable-update-channel=beta

ac_add_options --enable-strip diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 12a3b93..74f4fba 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -16,13 +16,16 @@ ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-li 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 +# We only use beta GeckoView for now; use default for local builds ac_add_options --enable-update-channel=beta

ac_add_options --enable-strip diff --git a/projects/gradle/config b/projects/gradle/config index de9b8ff..9e46681 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -16,6 +16,7 @@ var: 6.7.1: 3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d 6.9.1: 8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe 7.0.2: 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c + 7.3: de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410

input_files: - project: container-image diff --git a/projects/llvm-project/config b/projects/llvm-project/config index 646c201..cca2caa 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -4,17 +4,7 @@ git_hash: d28af7c654d8db0b68c175db5ce212d74fb5e9bc git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

-# TODO (aguestuser|2022-02-10): -# - we want to use version 13.0.0 for android builds -# - BUT: we are unable to build geckoview v96.0.x if we do so, b/c `clang_rt` errors -# as per: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_req... -# - for now, we revert to 12.0.0 for nightly, but plan to resolve issues using 13.0.0 -# before tagging next alpha release (11.5a5) - -######################## -# use this later! ----v -######################## -# targets: -# android: -# version: 13.0.0 -# git_hash: d7b669b3a30345cfcdb2fde2af6f48aa4b94845d +targets: + android: + version: 13.0.1 + git_hash: 75e33f71c2dae584b13a7d1186ae0a038ba98838 diff --git a/projects/rust/config b/projects/rust/config index a202bbc..1723e61 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.56.0 - previous_version: 1.55.0 + current_version: 1.59.0 + previous_version: 1.58.1 arch_deps: - libssl-dev - pkg-config diff --git a/rbm.conf b/rbm.conf index adeacfb..9dd8af6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -307,10 +307,9 @@ targets: android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]' CC: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang' CXX: '[% c("var/cross_prefix") %][% c("var/android_min_api") %]-clang' - # API 16 is the minimum we currently support for 32 bit on Android - android_min_api_armv7: 16 - android_min_api_x86: 16 - # API 21 is the minimum we currently support for 64 bit on Android + # API 21 is the minimum we currently support on Android + android_min_api_armv7: 21 + android_min_api_x86: 21 android_min_api_x86_64: 21 android_min_api_aarch64: 21 container:

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

gitolite role

1:41 p.m.

New subject: [builders/tor-browser-build] 08/08: Bug 40202: Sign Fenix QA apks with the latest version of apksign

This is an automated email from the git hooks/post-receive script.

boklm pushed a commit to branch master in repository builders/tor-browser-build.

commit 8e438a44e450c560a99c0b75df37600d41a886a4 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Thu Apr 21 11:23:31 2022 +0200

Bug 40202: Sign Fenix QA apks with the latest version of apksign --- projects/android-toolchain/config | 2 +- projects/tor-browser/build.android | 5 +++-- projects/tor-browser/config | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 8aa5e22..bcb33ca 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -24,7 +24,7 @@ var: 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_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin + 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" google_repo: https://dl.google.com/android/repository android_api_level: 31 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index e9354bd..3fcf8fd 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -1,5 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] assets_dir=assets ext_dir=$assets_dir/extensions qa_apk=[% dest_dir %]/[% c('filename') %]/tor-browser-[% c("version") %]-[% c("var/osname") %]-multi-qa.apk @@ -33,6 +34,6 @@ mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json

# Sign a QA build. This .apk is not a debug version and doesn't contain a debug # flag in the manifest. -java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android

-java -jar /usr/lib/android-sdk/build-tools/debian/apksigner.jar sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d152e59..9c2c63d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -45,8 +45,7 @@ targets: android: build: '[% INCLUDE build.android %]' var: - arch_deps: - - apksigner + android_toolchain_version: 31.0.0 verify_allowed_addons: 1

input_files: @@ -101,6 +100,9 @@ input_files: # To generate a new keystore, see how-to-generate-keystore.txt - filename: android-qa.keystore enable: '[% c("var/android") %]' + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' - name: electrum-nmc project: electrum-nmc enable: '[% c("var/namecoin") %]'

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

980

Age (days ago)

980

Last active (days ago)

tor-commits@lists.torproject.org

8 comments

1 participants

tags (0)

participants (1)

gitolite role