nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1837353 - Don't build the mozannotation crates when the crash reporter is disabled. r=gsvelto

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D180395
This commit is contained in:
Mike Hommey 2023-06-09 20:30:29 +00:00
parent dcac592260
commit b0c4622bd0
3 changed files with 9 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
toolkit/library/rust/gkrust-features.mozbuild
View file

@ -68,8 +68,10 @@ if CONFIG['OS_TARGET'] != 'Android':
if CONFIG['MOZ_ENABLE_DBUS']:
gkrust_features += ['with_dbus']
if CONFIG["MOZ_CRASHREPORTER"] and CONFIG['MOZ_OXIDIZED_BREAKPAD']:
gkrust_features += ['oxidized_breakpad']
if CONFIG["MOZ_CRASHREPORTER"]:
gkrust_features += ['crashreporter']
if CONFIG['MOZ_OXIDIZED_BREAKPAD']:
gkrust_features += ['oxidized_breakpad']
if CONFIG["MOZ_WEBMIDI_MIDIR_IMPL"]:
gkrust_features += ['webmidi_midir_impl']

5
toolkit/library/rust/shared/Cargo.toml
View file

@ -57,8 +57,8 @@ fluent-langneg = { version = "0.13", features = ["cldr"] }
fluent-langneg-ffi = { path = "../../../../intl/locale/rust/fluent-langneg-ffi" }
rure = "0.2.2"
rust_minidump_writer_linux = { path = "../../../crashreporter/rust_minidump_writer_linux", optional = true }
mozannotation_client = { path = "../../../crashreporter/mozannotation_client" }
mozannotation_server = { path = "../../../crashreporter/mozannotation_server" }
mozannotation_client = { path = "../../../crashreporter/mozannotation_client", optional = true }
mozannotation_server = { path = "../../../crashreporter/mozannotation_server", optional = true }
gecko-profiler = { path = "../../../../tools/profiler/rust-api"}
midir_impl = { path = "../../../../dom/midi/midir_impl", optional = true }
dom = { path = "../../../../dom/base/rust" }
@ -134,6 +134,7 @@ glean_disable_upload = ["fog_control/disable_upload"]
glean_million_queue = ["fog_control/million_queue"]
glean_with_gecko = ["fog_control/with_gecko", "jog/with_gecko"]
oxidized_breakpad = ["rust_minidump_writer_linux"]
crashreporter = ["mozannotation_client", "mozannotation_server"]
with_dbus = ["audio_thread_priority/with_dbus"]
thread_sanitizer = ["xpcom/thread_sanitizer"]
uniffi_fixtures = [

2
toolkit/library/rust/shared/lib.rs
View file

@ -92,7 +92,9 @@ extern crate gecko_logger;
#[cfg(feature = "oxidized_breakpad")]
extern crate rust_minidump_writer_linux;
#[cfg(feature = "crashreporter")]
extern crate mozannotation_client;
#[cfg(feature = "crashreporter")]
extern crate mozannotation_server;
#[cfg(feature = "webmidi_midir_impl")]