commit 65bd002fdbb23e9173ed9911c0386bff081ea755 parent 61df43a027c59b54f75725c028433c0b245e5cef Author: Nick Alexander <nalexander@mozilla.com> Date: Thu, 27 Nov 2025 18:48:38 +0000 Bug 1987757 - Part 3: Include `embedded-uniffi-bindgen` toolchain in Android tasks. r=taskgraph-reviewers,geckoview-reviewers,releng-reviewers,jmaher,ahal,ohall,nalexander There's no obvious way to make the toolchain conditional on being an artifact build, so we include it everywhere. Differential Revision: https://phabricator.services.mozilla.com/D266035 Diffstat:
26 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base @@ -18,6 +18,11 @@ ac_add_options --allow-insecure-gradle-repositories # Some dependencies may be conditionally-loaded (eg. semanticdb compiler plugins) ac_add_options --download-all-gradle-dependencies +# `android-gradle-dependencies` runs with `--dry-run`, so we don't +# need the _runtime_ `embedded-uniffi-bindgen` or `numbus-fml` dependencies. +ac_add_options --without-embedded-uniffi-bindgen +ac_add_options --without-nimbus-fml + # From here on, just like ../android-arm/nightly. . "$topsrcdir/build/mozconfig.no-compile" diff --git a/taskcluster/android_taskgraph/transforms/build_android_app.py b/taskcluster/android_taskgraph/transforms/build_android_app.py @@ -21,6 +21,8 @@ def add_common_config(config, tasks): fetches = task.setdefault("fetches", {}) fetches["toolchain"] = [ "android-sdk-linux", + "linux64-embedded-uniffi-bindgen", + "linux64-nimbus-fml", "android-gradle-dependencies", "linux64-jdk", ] diff --git a/taskcluster/kinds/build-components/kind.yml b/taskcluster/kinds/build-components/kind.yml @@ -39,6 +39,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk build-fat-aar: diff --git a/taskcluster/kinds/build-fat-aar/kind.yml b/taskcluster/kinds/build-fat-aar/kind.yml @@ -101,6 +101,8 @@ task-defaults: toolchain: - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-clang - linux64-jdk - linux64-rust-android diff --git a/taskcluster/kinds/build/android-asan.yml b/taskcluster/kinds/build/android-asan.yml @@ -41,6 +41,8 @@ task-defaults: toolchain: - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-rust-android - linux64-rust-size diff --git a/taskcluster/kinds/build/android-stuff.yml b/taskcluster/kinds/build/android-stuff.yml @@ -45,6 +45,8 @@ android-geckoview-docs/opt: toolchain: - android-gradle-dependencies - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-node optimization: diff --git a/taskcluster/kinds/build/android.yml b/taskcluster/kinds/build/android.yml @@ -63,6 +63,9 @@ task-defaults: - linux64-node - sysroot-x86_64-linux-gnu - sysroot-wasm32-wasi + # 'embedded-uniffi-bindgen' and 'nimbus-fml' only needed for artifact builds, but it's not easy to make that conditional. + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml android-arm/debug: description: "Android Arm Debug" diff --git a/taskcluster/kinds/build/fenix.yml b/taskcluster/kinds/build/fenix.yml @@ -28,6 +28,8 @@ task-defaults: toolchain: - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-rust-android - linux64-rust-size diff --git a/taskcluster/kinds/generate-baseline-profile-firebase/kind.yml b/taskcluster/kinds/generate-baseline-profile-firebase/kind.yml @@ -23,6 +23,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml optimization: skip-unless-backstop: null worker-type: b-linux-medium diff --git a/taskcluster/kinds/generate-profile/kind.yml b/taskcluster/kinds/generate-profile/kind.yml @@ -97,6 +97,8 @@ tasks: - linux64-minidump-stackwalk - linux64-hostutils - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-system-image-x86_64-linux - android34-avd-x86_64-linux @@ -140,6 +142,8 @@ tasks: - linux64-minidump-stackwalk - linux64-hostutils - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-system-image-x86_64-linux - android34-avd-x86_64-linux @@ -183,6 +187,8 @@ tasks: - linux64-minidump-stackwalk - linux64-hostutils - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android30-system-image-x86-linux - android30-avd-x86-linux diff --git a/taskcluster/kinds/instrumented-build-apk/kind.yml b/taskcluster/kinds/instrumented-build-apk/kind.yml @@ -18,6 +18,8 @@ task-defaults: fetches: toolchain: - linux64-android-sdk-linux-repack + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk-repack - linux64-node run: diff --git a/taskcluster/kinds/instrumented-build-macrobenchmark-apk/kind.yml b/taskcluster/kinds/instrumented-build-macrobenchmark-apk/kind.yml @@ -19,6 +19,8 @@ task-defaults: fetches: toolchain: - linux64-android-sdk-linux-repack + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk-repack - linux64-node run-on-projects: [] diff --git a/taskcluster/kinds/instrumented-build/kind.yml b/taskcluster/kinds/instrumented-build/kind.yml @@ -244,6 +244,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-android @@ -299,6 +301,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-android @@ -354,6 +358,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-android diff --git a/taskcluster/kinds/run-macrobenchmark-firebase/kind.yml b/taskcluster/kinds/run-macrobenchmark-firebase/kind.yml @@ -24,6 +24,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml optimization: skip-unless-backstop: null worker-type: b-linux-medium diff --git a/taskcluster/kinds/searchfox/kind.yml b/taskcluster/kinds/searchfox/kind.yml @@ -369,6 +369,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-cross diff --git a/taskcluster/kinds/source-test/android-detekt.yml b/taskcluster/kinds/source-test/android-detekt.yml @@ -17,6 +17,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk-repack platform: 'lint/opt' diff --git a/taskcluster/kinds/source-test/android-lint.yml b/taskcluster/kinds/source-test/android-lint.yml @@ -20,6 +20,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk-repack build-fat-aar: diff --git a/taskcluster/kinds/source-test/buildconfig.yml b/taskcluster/kinds/source-test/buildconfig.yml @@ -31,6 +31,8 @@ task-defaults: - linux64-node - android-gradle-dependencies - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml use-python: system diff --git a/taskcluster/kinds/source-test/ktlint.yml b/taskcluster/kinds/source-test/ktlint.yml @@ -14,6 +14,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk-repack platform: 'lint/opt' diff --git a/taskcluster/kinds/source-test/mozlint-android.yml b/taskcluster/kinds/source-test/mozlint-android.yml @@ -64,6 +64,8 @@ task-defaults: # Aliases aren't allowed for toolchains installed by fetch. - linux64-android-gradle-dependencies - linux64-android-sdk-linux-repack + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk-repack - linux64-node diff --git a/taskcluster/kinds/source-test/python-android.yml b/taskcluster/kinds/source-test/python-android.yml @@ -40,6 +40,8 @@ android-gradle-build: # Aliases aren't allowed for toolchains installed by fetch. - linux64-android-gradle-dependencies - linux64-android-sdk-linux-repack + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - linux64-jdk-repack - linux64-node when: diff --git a/taskcluster/kinds/test-apk/kind.yml b/taskcluster/kinds/test-apk/kind.yml @@ -25,6 +25,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk build-fat-aar: diff --git a/taskcluster/kinds/test-components/kind.yml b/taskcluster/kinds/test-components/kind.yml @@ -27,6 +27,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android-gradle-dependencies - linux64-jdk build-fat-aar: diff --git a/taskcluster/kinds/toolchain/onnx.yml b/taskcluster/kinds/toolchain/onnx.yml @@ -128,6 +128,8 @@ onnxruntime-arm-linux-androideabi: - linux64-clang-toolchain - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml onnxruntime-aarch64-linux-android: description: "ONNX Runtime (android aarch64)" @@ -143,6 +145,8 @@ onnxruntime-aarch64-linux-android: - linux64-clang-toolchain - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml onnxruntime-x86_64-linux-android: description: "ONNX Runtime (android x64)" @@ -158,3 +162,5 @@ onnxruntime-x86_64-linux-android: - linux64-clang-toolchain - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml diff --git a/taskcluster/kinds/ui-test-apk/kind.yml b/taskcluster/kinds/ui-test-apk/kind.yml @@ -24,6 +24,8 @@ task-defaults: fetches: toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml worker-type: b-linux-medium worker: docker-image: {in-tree: android-ui-tests} diff --git a/taskcluster/kinds/webrender/kind.yml b/taskcluster/kinds/webrender/kind.yml @@ -280,6 +280,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-avd-x86_64-linux - linux64-cargo-apk - linux64-jdk @@ -330,6 +332,8 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-avd-x86_64-linux - linux64-cargo-apk - linux64-jdk @@ -370,6 +374,8 @@ tasks: extract: false toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-system-image-x86_64-linux - android34-avd-x86_64-linux - linux64-jdk @@ -416,6 +422,8 @@ tasks: extract: false toolchain: - android-sdk-linux + - linux64-embedded-uniffi-bindgen + - linux64-nimbus-fml - android34-system-image-x86_64-linux - android34-avd-x86_64-linux - linux64-jdk