Backed out changeset 22a66a638fe5 (bug 1638438) for causing hunk failed on another backout
authorNoemi Erli <nerli@mozilla.com>
Sat, 16 May 2020 02:15:45 +0300
changeset 530428 99e688a54911994378409dfa58de8c42f83b724e
parent 530427 1ded947f34354e5b37d6b2b03be5d52e9533ac06
child 530429 399f99f8337ab9b6d63945d351162b2393e35ac8
push id116168
push usernerli@mozilla.com
push dateFri, 15 May 2020 23:17:51 +0000
treeherderautoland@399f99f8337a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1638438
milestone78.0a1
backs out22a66a638fe5870dc9bfedf61522a2bd4d0239c3
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 22a66a638fe5 (bug 1638438) for causing hunk failed on another backout
toolkit/library/rust/shared/Cargo.toml
toolkit/library/rust/shared/lib.rs
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -45,16 +45,17 @@ chardetng_c = "0.1.1"
 audio_thread_priority = "0.22.1"
 mdns_service = { path="../../../../media/mtransport/mdns_service", optional = true }
 neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu_bindings = { path = "../../../../gfx/wgpu_bindings", optional = true }
 mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", tag = "v0.3.0" }
 remote = { path = "../../../../remote", optional = true }
 fog = { path = "../../../components/glean", optional = true }
+webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge", optional = true }
 
 unic-langid = { version = "0.8", features = ["likelysubtags"] }
 unic-langid-ffi = { path = "../../../../intl/locale/rust/unic-langid-ffi" }
 fluent-langneg = { version = "0.12.1", features = ["cldr"] }
 fluent-langneg-ffi = { path = "../../../../intl/locale/rust/fluent-langneg-ffi" }
 
 viaduct = { git = "https://github.com/mozilla/application-services", rev = "77a7f5eb12a8d93f2bd71bd4d844405e06743365" }
 
@@ -64,17 +65,16 @@ viaduct = { git = "https://github.com/mo
 # changing this version.
 rusqlite = { version = "0.23.1", features = ["modern_sqlite", "in_gecko"] }
 
 fluent = { version = "0.11" , features = ["fluent-pseudo"] }
 fluent-ffi = { path = "../../../../intl/l10n/rust/fluent-ffi" }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 firefox-accounts-bridge = { path = "../../../../services/fxaccounts/rust-bridge/firefox-accounts-bridge" }
-webext_storage_bridge = { path = "../../../components/extensions/storage/webext_storage_bridge", optional = true }
 
 [build-dependencies]
 rustc_version = "0.2"
 
 [features]
 default = []
 quantum_render = ["webrender_bindings"]
 webrender_debugger = ["webrender_bindings/webrender_debugger"]
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -50,17 +50,17 @@ extern crate storage;
 #[cfg(feature = "quantum_render")]
 extern crate webrender_bindings;
 extern crate xpcom;
 #[cfg(feature = "new_xulstore")]
 extern crate xulstore;
 
 extern crate audio_thread_priority;
 
-#[cfg(all(feature = "new_webext_storage", not(target_os = "android")))]
+#[cfg(feature = "new_webext_storage")]
 extern crate webext_storage_bridge;
 
 #[cfg(feature = "webrtc")]
 extern crate mdns_service;
 extern crate neqo_glue;
 #[cfg(feature = "webgpu")]
 extern crate wgpu_bindings;
 
@@ -71,16 +71,18 @@ extern crate unic_langid;
 extern crate unic_langid_ffi;
 
 extern crate fluent_langneg;
 extern crate fluent_langneg_ffi;
 
 extern crate fluent;
 extern crate fluent_ffi;
 
+extern crate rusqlite;
+
 extern crate viaduct;
 
 #[cfg(feature = "remote")]
 extern crate remote;
 
 extern crate gecko_logger;
 
 #[cfg(target_os = "android")]