Backed out 10 changesets (bug 1759175) for causing build bustages coc…

…oabind related. CLOSED TREE

Backed out changeset 3d8279b62b0e (bug 1759175)
Backed out changeset fa1545689826 (bug 1759175)
Backed out changeset 00b28a515e8d (bug 1759175)
Backed out changeset 40dfe0d499df (bug 1759175)
Backed out changeset acde6c99092c (bug 1759175)
Backed out changeset e6d83c21eadc (bug 1759175)
Backed out changeset b34e196120aa (bug 1759175)
Backed out changeset 45a2a256b9d4 (bug 1759175)
Backed out changeset 4aba1755a610 (bug 1759175)
Backed out changeset 68d2d1abab21 (bug 1759175)

Cargo.toml

@@ -13,7 +13,6 @@ members = [
   "security/manager/ssl/osclientcerts",
   "testing/geckodriver",
   "toolkit/components/uniffi-bindgen-gecko-js",
-  "toolkit/crashreporter/client/app",
   "toolkit/crashreporter/mozwer-rust",
   "toolkit/crashreporter/rust_minidump_writer_linux",
   "toolkit/library/gtest/rust",

browser/installer/package-manifest.in

@@ -393,10 +393,14 @@ bin/libfreebl_64int_3.so
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
-#if defined(XP_WIN)
+@RESPATH@/crashreporter.ini
+#ifdef XP_UNIX
+@RESPATH@/Throbber-small.gif
+#elif defined(XP_WIN)
 @BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
 #endif
 #endif
+@RESPATH@/browser/crashreporter-override.ini
 #ifdef MOZ_CRASHREPORTER_INJECTOR
 @BINPATH@/breakpadinjector.dll
 #endif

browser/locales/en-US/crashreporter/crashreporter-override.ini

@@ -0,0 +1,9 @@
+; 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/.
+
+# This file is in the UTF-8 encoding
+[Strings]
+# LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
+CrashReporterProductErrorText2=Firefox had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
+CrashReporterDescriptionText2=Firefox had a problem and crashed. We’ll try to restore your tabs and windows when it restarts.\n\nTo help us diagnose and fix the problem, you can send us a crash report.

browser/locales/moz.build

@@ -9,6 +9,9 @@ JAR_MANIFESTS += ["jar.mn"]
 # If DIST_SUBDIR ever gets unset in browser this path might be wrong due to PREF_DIR changing.
 LOCALIZED_PP_FILES.defaults.preferences += ["en-US/firefox-l10n.js"]
 
+if CONFIG["MOZ_CRASHREPORTER"]:
+    LOCALIZED_FILES += ["en-US/crashreporter/crashreporter-override.ini"]
+
 if CONFIG["MOZ_UPDATER"]:
     LOCALIZED_GENERATED_FILES += ["updater.ini"]
     updater = LOCALIZED_GENERATED_FILES["updater.ini"]

build/rust/mozbuild/generate_buildconfig.py

@@ -13,20 +13,6 @@ def generate_bool(name):
     return f"pub const {name}: bool = {'true' if value else 'false'};\n"
 
 
-def generate_string_array(name):
-    value = buildconfig.substs.get(name) or []
-    return (
-        f"pub const {name}: [&str; {len(value)}] = ["
-        + ",".join(map(escape_rust_string, value))
-        + "];\n"
-    )
-
-
-def generate_string(name):
-    value = buildconfig.substs.get(name) or ""
-    return f"pub const {name}: &str = {escape_rust_string(value)};\n"
-
-
 def escape_rust_string(value):
     """escape the string into a Rust literal"""
     # This could be more generous, but we're only escaping paths with it.
@@ -99,18 +85,11 @@ def generate(output):
             )
         )
 
-    # Finally, write out some useful values from the buildconfig.
+    # Finally, write out some useful booleans from the buildconfig.
     output.write(generate_bool("MOZ_FOLD_LIBS"))
     output.write(generate_bool("NIGHTLY_BUILD"))
     output.write(generate_bool("RELEASE_OR_BETA"))
     output.write(generate_bool("EARLY_BETA_OR_EARLIER"))
     output.write(generate_bool("MOZ_DEV_EDITION"))
     output.write(generate_bool("MOZ_ESR"))
     output.write(generate_bool("MOZ_DIAGNOSTIC_ASSERT_ENABLED"))
-
-    # Used by toolkit/crashreporter/client
-    output.write(generate_bool("MOZ_CRASHREPORTER_MOCK"))
-    output.write(generate_string_array("CC_BASE_FLAGS"))
-    output.write(generate_string_array("MOZ_GTK3_CFLAGS"))
-    output.write(generate_string_array("MOZ_GTK3_LIBS"))
-    output.write(generate_string("MOZ_APP_NAME"))

build/workspace-hack/Cargo.toml

@@ -162,8 +162,6 @@ optional = true
 features = [
     "Wdk_System_Threading",
     "Win32_Foundation",
-    "Win32_Globalization",
-    "Win32_Graphics_Gdi",
     "Win32_Security",
     "Win32_Storage_FileSystem",
     "Win32_System_Com",
@@ -177,16 +175,13 @@ features = [
     "Win32_System_SystemInformation",
     "Win32_System_SystemServices",
     "Win32_System_Threading",
-    "Win32_UI_Controls",
-    "Win32_UI_Input_KeyboardAndMouse",
     "Win32_UI_Shell",
     "Win32_UI_WindowsAndMessaging",
 ]
 
 
 [features]
 builtins-static = ["dep:bindgen", "dep:bitflags", "dep:memchr", "dep:nom", "dep:regex", "dep:smallvec"]
-crashreporter = ["dep:env_logger", "dep:hyper", "dep:log", "dep:serde_json", "dep:time", "dep:uuid", "dep:windows-sys"]
 geckodriver = ["dep:bitflags", "dep:bytes", "dep:cc", "dep:chrono", "dep:flate2", "dep:futures-channel", "dep:futures-core", "dep:futures-sink", "dep:futures-util", "dep:getrandom", "dep:hashbrown", "dep:hyper", "dep:indexmap", "dep:log", "dep:memchr", "dep:mio", "dep:num-integer", "dep:num-traits", "dep:once_cell", "dep:regex", "dep:semver", "dep:serde_json", "dep:smallvec", "dep:time", "dep:tokio", "dep:tokio-util", "dep:tracing", "dep:url", "dep:uuid", "dep:windows-sys"]
 gkrust = ["dep:arrayvec", "dep:bindgen", "dep:bitflags", "dep:bytes", "dep:cc", "dep:chrono", "dep:env_logger", "dep:flate2", "dep:futures-channel", "dep:futures-core", "dep:futures-sink", "dep:futures-util", "dep:getrandom", "dep:hashbrown", "dep:indexmap", "dep:log", "dep:memchr", "dep:nom", "dep:num-integer", "dep:num-traits", "dep:once_cell", "dep:regex", "dep:scopeguard", "dep:semver", "dep:serde_json", "dep:smallvec", "dep:time", "dep:url", "dep:uuid", "dep:windows-sys"]
 gkrust-gtest = ["gkrust"]

mobile/android/installer/package-manifest.in

@@ -194,6 +194,14 @@
 @BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
 #endif
 
+; [Crash Reporter]
+; CrashService is not used on Android but the ini files are required for L10N
+; strings, see bug 1191351.
+#ifdef MOZ_CRASHREPORTER
+@BINPATH@/crashreporter.ini
+@BINPATH@/crashreporter-override.ini
+#endif
+
 [mobile]
 @BINPATH@/chrome/geckoview@JAREXT@
 @BINPATH@/chrome/geckoview.manifest

supply-chain/audits.toml

@@ -2381,12 +2381,6 @@ criteria = "safe-to-deploy"
 version = "0.5.4"
 notes = "I own this crate (I am contain-rs) and 0.5.4 passes miri. This code is very old and used by lots of people, so I'm pretty confident in it, even though it's in maintenance-mode and missing some nice-to-have APIs."
 
-[[audits.linked-hash-map]]
-who = "Alex Franchuk <[email protected]>"
-criteria = "safe-to-deploy"
-delta = "0.5.4 -> 0.5.6"
-notes = "New unsafe code has debug assertions and meets invariants. All other changes are formatting-related."
-
 [[audits.linked-hash-map]]
 who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-run"
@@ -4704,15 +4698,6 @@ who = "Makoto Kato <[email protected]>"
 criteria = "safe-to-deploy"
 version = "0.10.1"
 
-[[audits.zip]]
-who = "Alex Franchuk <[email protected]>"
-criteria = "safe-to-deploy"
-version = "0.6.4"
-notes = """
-No unsafe code nor unwarranted dependencies. Side-effectful std usage is only
-present where expected (zip archive reading/writing and unpacking)
-"""
-
 [[audits.zip]]
 who = "Mike Hommey <[email protected]>"
 criteria = "safe-to-run"

supply-chain/config.toml

@@ -817,3 +817,7 @@ criteria = "safe-to-deploy"
 [[exemptions.xml-rs]]
 version = "0.8.4"
 criteria = "safe-to-deploy"
+
+[[exemptions.zip]]
+version = "0.6.2"
+criteria = "safe-to-run"