[tor-commits] [builders/tor-browser-build] branch master updated: Bug 40116: Make Android testbuild single-arch

[gitolite role]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 0e0b425  Bug 40116: Make Android testbuild single-arch
0e0b425 is described below

commit 0e0b4255ceed711c1837d76627673576c8fb0ec5
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Tue May 17 09:15:15 2022 +0200

    Bug 40116: Make Android testbuild single-arch
---
 projects/android-components/config | 5 ++++-
 projects/fenix/config              | 4 ++++
 rbm.conf                           | 4 +++-
 rbm.local.conf.example             | 4 ++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config
index 5b5fe9e..eff85be 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -34,10 +34,13 @@ input_files:
   - project: gradle
     name: gradle
     pkg_type: build
+  - name: geckoview
+    project: geckoview
+    enable: '[% !c("var/fetch_gradle_dependencies") && c("var/android_single_arch") %]'
   - name: geckoview
     project: geckoview
     pkg_type: merge_aars
-    enable: '[% !c("var/fetch_gradle_dependencies") %]'
+    enable: '[% !c("var/fetch_gradle_dependencies") && !c("var/android_single_arch") %]'
   - name: application-services
     project: application-services
     enable: '[% !c("var/fetch_gradle_dependencies") %]'
diff --git a/projects/fenix/config b/projects/fenix/config
index 756c8a7..2b14ad7 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -39,9 +39,13 @@ input_files:
     project: android-components
   - name: application-services
     project: application-services
+  - name: geckoview
+    project: geckoview
+    enable: '[% c("var/android_single_arch") %]'
   - name: geckoview
     project: geckoview
     pkg_type: merge_aars
+    enable: '[% !c("var/android_single_arch") %]'
   - name: tba-translation
     project: tba-translation
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
diff --git a/rbm.conf b/rbm.conf
index e9fa2c6..4e23b77 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -34,7 +34,7 @@ steps:
       #!/bin/bash
       [% c("var/set_default_env") %]
       mkdir /var/tmp/dist
-      # NOTE: since different projects need different rust versions, 
+      # 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
@@ -255,6 +255,8 @@ targets:
       testbuild: 1
       # Don't create mar files to save time
       build_mar: 0
+      # Building only one architecture saves a lot of time
+      android_single_arch: 1
 
   torbrowser-android-armv7:
     - android-armv7
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index dd59034..9f5ad4e 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -97,6 +97,10 @@ targets:
       ### Uncomment this if you want to create mar files in your test build.
       #build_mar: 1
 
+      ### Uncomment this if you want to enable the merge_aars step in your test
+      ### build, meaning that GeckoView will be compiled for all architectures.
+      #android_single_arch: 0
+
   nightly:
 
     ### By default 'fetch' is set to 1 for nightly builds, meaning that new

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