Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1591563 - Only build the fogotype crate on Nightly r=janerik,lina

Browse Source 
Depends on D53713

Differential Revision: https://phabricator.services.mozilla.com/D53714

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris H-C 2019-11-19 13:52:28 +00:00
parent f74263f73d
commit 4c9531deec
5 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
toolkit/library/rust/Cargo.toml
View File

@ -30,6 +30,7 @@ fuzzing_interfaces = ["gkrust-shared/fuzzing_interfaces"]
webrtc = ["gkrust-shared/webrtc"]
wasm_library_sandboxing = ["gkrust-shared/wasm_library_sandboxing"]
webgpu = ["gkrust-shared/webgpu"]
fogotype = ["gkrust-shared/fogotype"]
[dependencies]
gkrust-shared = { path = "shared" }

3
toolkit/library/rust/gkrust-features.mozbuild
View File

@ -67,3 +67,6 @@ if CONFIG['FUZZING_INTERFACES']:
if CONFIG['MOZ_WEBRTC']:
gkrust_features += ['webrtc']
if CONFIG['MOZ_FOGOTYPE']:
gkrust_features += ['fogotype']

3
toolkit/library/rust/shared/Cargo.toml
View File

@ -45,7 +45,7 @@ neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
wgpu-remote = { path = "../../../../gfx/wgpu/wgpu-remote", optional = true }
mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", tag = "v0.3.0" }
fog = { path = "../../../components/telemetry/fog" }
fog = { path = "../../../components/telemetry/fog", optional = true }
[build-dependencies]
rustc_version = "0.2"
@ -75,6 +75,7 @@ fuzzing_interfaces = []
webrtc = ["mdns_service"]
wasm_library_sandboxing = ["rlbox_lucet_sandbox"]
webgpu = ["wgpu-remote"]
fogotype = ["fog"]
[lib]
path = "lib.rs"

1
toolkit/library/rust/shared/lib.rs
View File

@ -46,6 +46,7 @@ extern crate storage;
#[cfg(feature = "moz_places")]
extern crate bookmark_sync;
extern crate shift_or_euc_c;
#[cfg(feature = "fogotype")]
extern crate fog;
extern crate audio_thread_priority;

11
toolkit/moz.configure
View File

@ -1892,3 +1892,14 @@ def new_cert_storage(milestone):
set_config('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)
set_define('MOZ_NEW_CERT_STORAGE', True, when=new_cert_storage)
# FOGotype prototype Glean SDK Integration Crate
# ==============================================================
@depends(milestone)
def fogotype(milestone):
if milestone.is_nightly:
return True
set_config('MOZ_FOGOTYPE', True, when=fogotype)
set_define('MOZ_FOGOTYPE', True, when=fogotype)