commit e8ff6b182dcd9d721ec97473051bda48d36d822e Author: Georg Koppen <gk@torproject.org> Date: Wed Sep 16 16:54:21 2020 +0000 Bug 40094: Bring back torbrowser-android-* targets for Rust Apparently we can't just replace the torbrowser-android-* targets with android-* ones when including the Rust compilers for application-services. Thus, we revert that part of the patch for #40070. See: #40094 for more details. --- projects/application-services/config | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 0560872..336de62 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -23,22 +23,23 @@ input_files: - project: container-image - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' + # We need the torbrowser-* targets for Rust, see: #40094. - project: fenix-rust name: rust-armv7 target_prepend: - - android-armv7 + - torbrowser-android-armv7 - project: fenix-rust name: rust-aarch64 target_prepend: - - android-aarch64 + - torbrowser-android-aarch64 - project: fenix-rust name: rust-x86 target_prepend: - - android-x86 + - torbrowser-android-x86 - project: fenix-rust name: rust-x86_64 target_prepend: - - android-x86_64 + - torbrowser-android-x86_64 - project: nss name: nss-armv7 target_prepend: