commit be2c4e77ecbdaa5fcf482da10d614d932b89f8de
Author: Georg Koppen <gk(a)torproject.org>
Date: Mon Dec 7 09:57:58 2020 +0000
Bug 40171: Include all uniffi-rs artifacts into application-services
---
projects/application-services/build | 4 +++-
projects/application-services/config | 24 +++++++++++++++++++++---
2 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/projects/application-services/build b/projects/application-services/build
index 77f6e2d..f366605 100644
--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -21,7 +21,9 @@ cd /var/tmp/dist
tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %]
mv sqlcipher sqlcipher-[% arch %]
[% END -%]
-tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs') %]
+# We pick the armv7 flavor, but it actually does not matter which one we choose
+# as `uniffi-bindgen` is a host tool. See: tor-browser-build#40171.
+tar -xf $rootdir/[% c('input_files_by_name/uniffi-rs-armv7') %]
export PATH=/var/tmp/dist/rust/bin:/var/tmp/dist/uniffi-rs:$PATH
cd $rootdir
diff --git a/projects/application-services/config b/projects/application-services/config
index 5eecbad..a67a880 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -26,7 +26,8 @@ input_files:
name: '[% c("var/compiler") %]'
- project: gradle
name: gradle
- # We need the torbrowser-* targets for Rust, see: #40094.
+ # We need the torbrowser-* targets for Rust and Rust-dependent projects, see:
+ # #40094.
- project: rust
name: rust-armv7
target_prepend:
@@ -43,6 +44,25 @@ input_files:
name: rust-x86_64
target_prepend:
- torbrowser-android-x86_64
+ # `uniffi-rs` provides us with a host tool, yet we still need to include
+ # artifacts for all architectures to avoid unnecessary rebuilding later on.
+ # See: tor-browser-build#40171.
+ - project: uniffi-rs
+ name: uniffi-rs-armv7
+ target_prepend:
+ - torbrowser-android-armv7
+ - project: uniffi-rs
+ name: uniffi-rs-aarch64
+ target_prepend:
+ - torbrowser-android-aarch64
+ - project: uniffi-rs
+ name: uniffi-rs-x86
+ target_prepend:
+ - torbrowser-android-x86
+ - project: uniffi-rs
+ name: uniffi-rs-x86_64
+ target_prepend:
+ - torbrowser-android-x86_64
- project: nss
name: nss-armv7
target_prepend:
@@ -75,8 +95,6 @@ input_files:
name: sqlcipher-x86_64
target_prepend:
- android-x86_64
- - name: uniffi-rs
- project: uniffi-rs
- name: python
project: python
enable: '[% !c("var/fetch_gradle_dependencies") %]'