commit d2e33327960fd129a2c1957c6aac5dc252d1285c parent 3df1f643892a6bd561c93c4ef255ddbd15d7423a Author: Cristian Tuns <ctuns@mozilla.com> Date: Fri, 28 Nov 2025 18:58:11 -0500 Revert "Bug 1987757 - Part 3: Include `embedded-uniffi-bindgen` toolchain in Android tasks. r=taskgraph-reviewers,geckoview-reviewers,releng-reviewers,jmaher,ahal,ohall,nalexander" local android builds are busted and will stay busted as long as this is in-tree This reverts commit a8ea9ca07f1b6617653de30a2accfe46af6b5655. Revert "Bug 1987757 - Part 2: Expose `embedded-uniffi-bindgen` to build. r=firefox-build-system-reviewers,ahochheiden,nalexander" This reverts commit 2e1b5393dc93694d94c3e1affe2dd4ed6677c93e. Revert "Bug 1987757 - Part 1: Add `embedded-uniffi-bindgen` and `nimbus-fml` stub toolchains. r=taskgraph-reviewers,jmaher,nalexander" This reverts commit 76f2f563a232ead54883bb3145b1713ece03c3f2. Diffstat:
43 files changed, 3 insertions(+), 462 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock @@ -7146,20 +7146,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" [[package]] -name = "toolchain-embedded-uniffi-bindgen" -version = "0.1.0" -dependencies = [ - "mozilla-central-workspace-hack", -] - -[[package]] -name = "toolchain-nimbus-fml" -version = "0.1.0" -dependencies = [ - "mozilla-central-workspace-hack", -] - -[[package]] name = "topological-sort" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/Cargo.toml b/Cargo.toml @@ -17,8 +17,6 @@ members = [ "security/manager/ssl/qwac_trust_anchors", "security/manager/ssl/trust_anchors", "security/mls/mls_gk", - "services/app-services-tools/embedded-uniffi-bindgen", - "services/app-services-tools/nimbus-fml", "testing/geckodriver", "toolkit/components/uniffi-bindgen-gecko-js", "toolkit/crashreporter/client/app", diff --git a/build/workspace-hack/Cargo.toml b/build/workspace-hack/Cargo.toml @@ -278,5 +278,3 @@ mozwer_s = ["dep:allocator-api2", "dep:byteorder", "dep:getrandom", "dep:hashbro nmhproxy = ["dep:allocator-api2", "dep:bitflags", "dep:byteorder", "dep:form_urlencoded", "dep:hashbrown", "dep:icu_locale_core", "dep:icu_properties", "dep:idna", "dep:indexmap", "dep:once_cell", "dep:percent-encoding", "dep:serde_json", "dep:smallvec", "dep:stable_deref_trait", "dep:tinystr", "dep:unicode-bidi", "dep:url", "dep:windows-sys", "dep:yoke", "dep:zerocopy", "dep:zerofrom", "dep:zerovec"] pkcs11testmodule-static = [] test-trust-anchors-static = ["dep:bindgen", "dep:bitflags", "dep:itertools", "dep:memchr", "dep:nom", "dep:regex", "dep:smallvec"] -toolchain-embedded-uniffi-bindgen = [] -toolchain-nimbus-fml = [] diff --git a/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base b/mobile/android/config/mozconfigs/android-arm-gradle-dependencies/base @@ -18,11 +18,6 @@ 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/mobile/android/moz.configure b/mobile/android/moz.configure @@ -186,46 +186,3 @@ set_config( "MOZ_ANDROID_FAT_AAR_ARCHITECTURES", depends("MOZ_ANDROID_FAT_AAR_ARCHITECTURES")(lambda x: x), ) - - -# Template to check for a build-time host/bin program that is either produced as -# part of the build or is fetched from a toolchain artifact. Also allows -# `--without-{prog}` to disable checking. -# -# Such compiled programs are "part of the build" but need special accommodations -# to distribute to artifact builds: they are distributed as toolchain builds -# rather than extracted from a package or a test package. In addition, these -# compiled programs may not be needed for very unusual jobs, in particular -# `android-gradle-dependencies` jobs, so they can be disabled entirely. -# -# - `var` is the name of the variable that will be set with `set_config` when -# the program is found, like "A_PROG". -# - `prog` is the name of the program, like "a-prog". -# - `toolchain` is the name of the toolchain (defaults to `prog`). -@template -def check_host_bin_prog(var, prog, toolchain=None): - option(f"--without-{prog}", help="Disable building with {prog}") - - with only_when(f"--with-{prog}"): - with only_when(compile_environment): - # Produced at build-time. Look in `$DIST/host/bin`. - set_config( - var, - depends(build_environment.dist, bin_suffix(host))( - lambda dist, bin_suffix: f"{dist}/host/bin/{prog}{bin_suffix}" - ), - ) - - with only_when(~compile_environment): - # Fetched at configure-time. Look in `~/.mozbuild` locally or - # `$MOZ_FETCH_DIR` in automation. - check_prog( - var, - [prog], - what=prog, - bootstrap=toolchain or prog, - ) - - -check_host_bin_prog("EMBEDDED_UNIFFI_BINDGEN", "embedded-uniffi-bindgen") -check_host_bin_prog("NIMBUS_FML", "nimbus-fml") diff --git a/services/app-services-tools/README.md b/services/app-services-tools/README.md @@ -1,16 +0,0 @@ -# App Services Tooling - -This directory holds tools implemented by application-services and required to be -used in the build process. - -There are 2 such tools - 'embedded-uniffi-bindgen' and 'nimbus-fml', both of which -will be called by the gradle build system. - -Note that these are effectively wrappers - the tools themselves remain in the app-services directory, -but these crates form a wrapper around them, meaning consumers don't need to know the full path -to the tool, just the path to this directory. - -NOTE: This is landing before app-services itself. That means that currently these are just -stub tools. Once we move app-services into this directory the stubs will be updated to -become actual wrappers around the tools. This helps us solve a bit of a chicken-and-egg -problem landing app-services. Updating these stubs is bug 2002854. diff --git a/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml b/services/app-services-tools/embedded-uniffi-bindgen/Cargo.toml @@ -1,11 +0,0 @@ -[package] -name = "toolchain-embedded-uniffi-bindgen" -version = "0.1.0" -edition = "2021" -license = "MPL-2.0" - -[[bin]] -name = "embedded-uniffi-bindgen" - -[dependencies] -mozilla-central-workspace-hack = { version = "0.1", features = ["toolchain-embedded-uniffi-bindgen"], optional = true } diff --git a/services/app-services-tools/embedded-uniffi-bindgen/moz.build b/services/app-services-tools/embedded-uniffi-bindgen/moz.build @@ -1,22 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -HOST_RUST_PROGRAMS = ["embedded-uniffi-bindgen"] - -with Files("**"): - BUG_COMPONENT = ("Application Services", "General") - -# copy-pasta from other moz.build file. -if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": - OS_LIBS += ["-framework CoreFoundation"] -elif CONFIG["OS_TARGET"] == "WINNT": - OS_LIBS += [ - "advapi32", - "wsock32", - "ws2_32", - "mswsock", - "winmm", - ] diff --git a/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs b/services/app-services-tools/embedded-uniffi-bindgen/src/bin/embedded-uniffi-bindgen.rs @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -fn main() { - unreachable!("a place-holder for the app-services monorepo migration"); -} diff --git a/services/app-services-tools/nimbus-fml/Cargo.toml b/services/app-services-tools/nimbus-fml/Cargo.toml @@ -1,11 +0,0 @@ -[package] -name = "toolchain-nimbus-fml" -version = "0.1.0" -edition = "2021" -license = "MPL-2.0" - -[[bin]] -name = "nimbus-fml" - -[dependencies] -mozilla-central-workspace-hack = { version = "0.1", features = ["toolchain-nimbus-fml"], optional = true } diff --git a/services/app-services-tools/nimbus-fml/moz.build b/services/app-services-tools/nimbus-fml/moz.build @@ -1,22 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -HOST_RUST_PROGRAMS = ["nimbus-fml"] - -with Files("**"): - BUG_COMPONENT = ("Application Services", "General") - -# copy-pasta from other moz.build file. -if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": - OS_LIBS += ["-framework CoreFoundation"] -elif CONFIG["OS_TARGET"] == "WINNT": - OS_LIBS += [ - "advapi32", - "wsock32", - "ws2_32", - "mswsock", - "winmm", - ] diff --git a/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs b/services/app-services-tools/nimbus-fml/src/bin/nimbus-fml.rs @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * 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/. */ - -fn main() { - unreachable!("a place-holder for the app-services monorepo migration"); -} diff --git a/services/moz.build b/services/moz.build @@ -7,9 +7,6 @@ with Files("moz.build"): BUG_COMPONENT = ("Firefox Build System", "General") -with Files("app-services-tools/**"): - BUG_COMPONENT = ("Application Services", "General") - DIRS += [ "common", "crypto", @@ -22,8 +19,10 @@ DIRS += [ # actually adds them, after which it is possible to enable the flag. if CONFIG["MOZ_APPSERVICES_IN_TREE"]: DIRS += [ + "app-services/components/support/nimbus-fml", "app-services/megazords/full", "app-services/megazords/fenix-dylib", + "app-services/tools/embedded-uniffi-bindgen", ] # The automation dir is only included in nightlies and debug @@ -35,12 +34,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": "fxaccounts", ] -if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": - DIRS += [ - "app-services-tools/embedded-uniffi-bindgen", - "app-services-tools/nimbus-fml", - ] - if CONFIG["MOZ_SERVICES_SYNC"]: DIRS += ["sync"] diff --git a/taskcluster/android_taskgraph/transforms/build_android_app.py b/taskcluster/android_taskgraph/transforms/build_android_app.py @@ -21,8 +21,6 @@ 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,8 +39,6 @@ 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,8 +101,6 @@ 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-samples-browser/kind.yml b/taskcluster/kinds/build-samples-browser/kind.yml @@ -27,8 +27,6 @@ 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/android-asan.yml b/taskcluster/kinds/build/android-asan.yml @@ -41,8 +41,6 @@ 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,8 +45,6 @@ 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,9 +63,6 @@ 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,8 +28,6 @@ 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,8 +23,6 @@ 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,8 +97,6 @@ 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 @@ -142,8 +140,6 @@ 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 @@ -187,8 +183,6 @@ 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,8 +18,6 @@ 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,8 +19,6 @@ 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,8 +244,6 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux - - linux64-embedded-uniffi-bindgen - - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-android @@ -301,8 +299,6 @@ tasks: - android-gradle-dependencies - android-ndk-linux - android-sdk-linux - - linux64-embedded-uniffi-bindgen - - linux64-nimbus-fml - linux64-jdk - linux64-clang - linux64-rust-android @@ -358,8 +354,6 @@ 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,8 +24,6 @@ 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,8 +369,6 @@ 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,8 +17,6 @@ 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,8 +20,6 @@ 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,8 +31,6 @@ 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,8 +14,6 @@ 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,8 +64,6 @@ 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,8 +40,6 @@ 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,8 +25,6 @@ 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,8 +27,6 @@ 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/embedded-uniffi-bindgen.yml b/taskcluster/kinds/toolchain/embedded-uniffi-bindgen.yml @@ -1,106 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. ---- -task-defaults: - description: "embedded-uniffi-bindgen toolchain build" - worker-type: b-linux-amd - worker: - max-run-time: 1800 - env: - CRATE_PATH: services/app-services-tools/embedded-uniffi-bindgen - attributes: - local-toolchain: true - run: - script: build-rust-based-toolchain.sh - toolchain-artifact: public/build/embedded-uniffi-bindgen.tar.zst - sparse-profile: null - resources: - - 'services/app-services-tools/embedded-uniffi-bindgen' - -# For Linux platforms target "*-musl" so that the binary will be statically linked. - -linux64-embedded-uniffi-bindgen: - treeherder: - symbol: TL(eub) - platform: linux64/opt - run: - arguments: ['x86_64-unknown-linux-musl'] - attributes: - build_platform: linux64-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-rust-static - -macosx64-embedded-uniffi-bindgen: - treeherder: - symbol: TM(eub) - platform: macosx64/opt - run: - arguments: ['x86_64-apple-darwin'] - attributes: - build_platform: macosx64-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-macos - - macosx64-sdk-toolchain - -macosx64-aarch64-embedded-uniffi-bindgen: - treeherder: - symbol: TMA64(eub) - platform: macosx64-aarch64/opt - run: - arguments: ['aarch64-apple-darwin'] - attributes: - build_platform: macosx64-aarch64-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-macos - - macosx64-sdk-toolchain - -win32-embedded-uniffi-bindgen: - treeherder: - symbol: TW32(eub) - platform: win32/opt - run: - arguments: ['i686-pc-windows-msvc'] - toolchain-artifact: public/build/embedded-uniffi-bindgen.zip - attributes: - build_platform: win32-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain - -win64-aarch64-embedded-uniffi-bindgen: - treeherder: - symbol: TWA64(eub) - platform: windows2012-aarch64/opt - run: - arguments: ['aarch64-pc-windows-msvc'] - toolchain-artifact: public/build/embedded-uniffi-bindgen.zip - attributes: - build_platform: win64-aarch64-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain - -win64-embedded-uniffi-bindgen: - treeherder: - symbol: TW64(eub) - platform: win64/opt - run: - arguments: ['x86_64-pc-windows-msvc'] - toolchain-artifact: public/build/embedded-uniffi-bindgen.zip - attributes: - build_platform: win64-embedded-uniffi-bindgen - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain diff --git a/taskcluster/kinds/toolchain/kind.yml b/taskcluster/kinds/toolchain/kind.yml @@ -35,7 +35,6 @@ tasks-from: - compiler-rt.yml - dxc.yml - dump-syms.yml - - embedded-uniffi-bindgen.yml - fix-stacks.yml - gcc.yml - geckodriver.yml @@ -51,7 +50,6 @@ tasks-from: - minidump-stackwalk.yml - misc.yml - nasm.yml - - nimbus-fml.yml - node.yml - onnx.yml - pkgconf.yml diff --git a/taskcluster/kinds/toolchain/nimbus-fml.yml b/taskcluster/kinds/toolchain/nimbus-fml.yml @@ -1,106 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. ---- -task-defaults: - description: "nimbus-fml toolchain build" - worker-type: b-linux-amd - worker: - max-run-time: 1800 - env: - CRATE_PATH: services/app-services-tools/nimbus-fml - attributes: - local-toolchain: true - run: - script: build-rust-based-toolchain.sh - toolchain-artifact: public/build/nimbus-fml.tar.zst - sparse-profile: null - resources: - - 'services/app-services-tools/nimbus-fml' - -# For Linux platforms target "*-musl" so that the binary will be statically linked. - -linux64-nimbus-fml: - treeherder: - symbol: TL(enf) - platform: linux64/opt - run: - arguments: ['x86_64-unknown-linux-musl'] - attributes: - build_platform: linux64-nimbus-fml - fetches: - toolchain: - - linux64-rust-static - -macosx64-nimbus-fml: - treeherder: - symbol: TM(enf) - platform: macosx64/opt - run: - arguments: ['x86_64-apple-darwin'] - attributes: - build_platform: macosx64-nimbus-fml - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-macos - - macosx64-sdk-toolchain - -macosx64-aarch64-nimbus-fml: - treeherder: - symbol: TMA64(enf) - platform: macosx64-aarch64/opt - run: - arguments: ['aarch64-apple-darwin'] - attributes: - build_platform: macosx64-aarch64-nimbus-fml - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-macos - - macosx64-sdk-toolchain - -win32-nimbus-fml: - treeherder: - symbol: TW32(enf) - platform: win32/opt - run: - arguments: ['i686-pc-windows-msvc'] - toolchain-artifact: public/build/nimbus-fml.zip - attributes: - build_platform: win32-nimbus-fml - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain - -win64-aarch64-nimbus-fml: - treeherder: - symbol: TWA64(enf) - platform: windows2012-aarch64/opt - run: - arguments: ['aarch64-pc-windows-msvc'] - toolchain-artifact: public/build/nimbus-fml.zip - attributes: - build_platform: win64-aarch64-nimbus-fml - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain - -win64-nimbus-fml: - treeherder: - symbol: TW64(enf) - platform: win64/opt - run: - arguments: ['x86_64-pc-windows-msvc'] - toolchain-artifact: public/build/nimbus-fml.zip - attributes: - build_platform: win64-nimbus-fml - fetches: - toolchain: - - linux64-clang-toolchain - - linux64-rust-windows - - vs-toolchain diff --git a/taskcluster/kinds/toolchain/onnx.yml b/taskcluster/kinds/toolchain/onnx.yml @@ -128,8 +128,6 @@ 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)" @@ -145,8 +143,6 @@ 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)" @@ -162,5 +158,3 @@ 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,8 +24,6 @@ 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,8 +280,6 @@ 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 @@ -332,8 +330,6 @@ 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 @@ -374,8 +370,6 @@ 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 @@ -422,8 +416,6 @@ 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 diff --git a/taskcluster/scripts/misc/build-rust-based-toolchain.sh b/taskcluster/scripts/misc/build-rust-based-toolchain.sh @@ -66,12 +66,7 @@ esac PATH="$MOZ_FETCHES_DIR/rustc/bin:$MOZ_FETCHES_DIR/clang/bin:$PATH" -if [ -n "${CRATE_PATH}" ]; then - CRATE_PATH="${GECKO_PATH}/${CRATE_PATH}" -else - CRATE_PATH=$MOZ_FETCHES_DIR/${FETCH-$project} -fi - +CRATE_PATH=$MOZ_FETCHES_DIR/${FETCH-$project} WORKSPACE_ROOT=$(cd $CRATE_PATH; cargo metadata --format-version 1 --no-deps --locked 2> /dev/null | jq -r .workspace_root) if test ! -f $WORKSPACE_ROOT/Cargo.lock; then