From 25b3af062c6a07d0f2594f48179d523f99a40b47 Mon Sep 17 00:00:00 2001
From: Alex Franchuk <afranchuk@mozilla.com>
Date: Fri, 7 Feb 2025 14:35:58 +0000
Subject: [PATCH] Bug 1945648 - Remove MOZ_BUILDID from the mozbuild crate
 r=pehrsons,glandium

This was causing dependents of mozbuild to be rebuilt often and
unnecessarily.

Differential Revision: https://phabricator.services.mozilla.com/D237105
---
 Makefile.in                                   |  5 -----
 build/rust/mozbuild/generate_buildconfig.py   | 15 ---------------
 config/faster/rules.mk                        |  3 ---
 toolkit/crashreporter/client/app/src/glean.rs |  3 ++-
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c2d53c0e326b..2658629f9183 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,11 +36,6 @@ source-repo.h: $(MDDEPDIR)/source-repo.h.stub
 buildid.h: $(MDDEPDIR)/buildid.h.stub
 # Add explicit dependencies that moz.build can't declare yet.
 build/$(MDDEPDIR)/application.ini.stub: source-repo.h buildid.h
-  # The mozbuild crate includes the buildid (via `variables.py:get_buildid()`),
-  # so it can only be generated after the buildid file is generated.
-ifeq ($(and $(JS_STANDALONE),$(MOZ_BUILD_APP)),)
-build/rust/mozbuild/$(MDDEPDIR)/buildconfig.rs.stub: buildid.h
-endif
 
 BUILD_BACKEND_FILES := $(addprefix backend.,$(addsuffix Backend,$(BUILD_BACKENDS)))
 
diff --git a/build/rust/mozbuild/generate_buildconfig.py b/build/rust/mozbuild/generate_buildconfig.py
index f675841f2086..45c7cc5aa6fc 100644
--- a/build/rust/mozbuild/generate_buildconfig.py
+++ b/build/rust/mozbuild/generate_buildconfig.py
@@ -6,7 +6,6 @@ import string
 import textwrap
 
 import buildconfig
-from variables import get_buildid
 
 
 def generate_bool(name):
@@ -80,20 +79,6 @@ def generate(output):
         )
     )
 
-    # buildid.h is only available in these conditions (see the top-level moz.build)
-    if not buildconfig.substs.get("JS_STANDALONE") or not buildconfig.substs.get(
-        "MOZ_BUILD_APP"
-    ):
-        output.write(
-            textwrap.dedent(
-                f"""
-                /// The build id of the current build.
-                pub const MOZ_BUILDID: &str = {escape_rust_string(get_buildid())};
-
-                """
-            )
-        )
-
     windows_rs_dir = buildconfig.substs.get("MOZ_WINDOWS_RS_DIR")
     if windows_rs_dir:
         output.write(
diff --git a/config/faster/rules.mk b/config/faster/rules.mk
index 2608df44d45c..79833a10348e 100644
--- a/config/faster/rules.mk
+++ b/config/faster/rules.mk
@@ -93,6 +93,3 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/
 # that are not supported by data in moz.build.
 
 $(TOPOBJDIR)/build/.deps/application.ini.stub: $(TOPOBJDIR)/buildid.h $(TOPOBJDIR)/source-repo.h
-ifeq ($(and $(JS_STANDALONE),$(MOZ_BUILD_APP)),)
-$(TOPOBJDIR)/build/rust/mozbuild/.deps/buildconfig.rs.stub: $(TOPOBJDIR)/buildid.h
-endif
diff --git a/toolkit/crashreporter/client/app/src/glean.rs b/toolkit/crashreporter/client/app/src/glean.rs
index 56d98195a182..b02c7b6e648a 100644
--- a/toolkit/crashreporter/client/app/src/glean.rs
+++ b/toolkit/crashreporter/client/app/src/glean.rs
@@ -54,7 +54,8 @@ fn glean_data_dir(_cfg: &Config) -> ::std::path::PathBuf {
 
 fn client_info_metrics(cfg: &Config) -> ClientInfoMetrics {
     glean::ClientInfoMetrics {
-        app_build: mozbuild::config::MOZ_BUILDID.into(),
+        // We can't get the build id at compile time; see bug 1945648.
+        app_build: env!("CARGO_PKG_VERSION").into(),
         app_display_version: env!("CARGO_PKG_VERSION").into(),
         channel: None,
         locale: cfg.strings.as_ref().map(|s| s.locale()),