Bug 1511811 - Update mozjs and enable 'init_once' feature for Android.
authorPaul Rouget <me@paulrouget.com>
Mon, 19 Nov 2018 09:11:54 +0100
changeset 508479 4a9fe235c6b0f2255880fe8c914b6f57f929232c
parent 508478 2c5cf5f741b890fb71bf0c27c743e4f0e3a1dbed
child 508480 7a36832beb552ab97cb7a723a8cad888ed318dd4
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1511811, 22200
milestone65.0a1
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
Bug 1511811 - Update mozjs and enable 'init_once' feature for Android. Cherry-picks https://github.com/servo/servo/pull/22200
servo/components/malloc_size_of/Cargo.toml
--- a/servo/components/malloc_size_of/Cargo.toml
+++ b/servo/components/malloc_size_of/Cargo.toml
@@ -27,23 +27,28 @@ servo = [
 [dependencies]
 app_units = "0.7"
 cssparser = "0.25"
 euclid = "0.19"
 hashglobe = { path = "../hashglobe" }
 hyper = { version = "0.12", optional = true }
 hyper_serde = { version = "0.9", optional = true }
 keyboard-types = {version = "0.4.3", optional = true}
-mozjs = { version = "0.9.4", optional = true }
 selectors = { path = "../selectors" }
 serde = { version = "1.0.27", optional = true }
 serde_bytes = { version = "0.10", optional = true }
 servo_arc = { path = "../servo_arc" }
 servo_channel = { path = "../channel", optional = true }
 smallbitvec = "2.1.0"
 smallvec = "0.6"
 string_cache = { version = "0.7", optional = true }
 thin-slice = "0.1.0"
 time = { version = "0.1.17", optional = true }
 url = { version = "1.2", optional = true }
 webrender_api = { git = "https://github.com/servo/webrender", features = ["ipc"], optional = true }
 xml5ever = { version = "0.12", optional = true }
 void = "1.0.2"
+
+[target.'cfg(target_os = "android")'.dependencies]
+mozjs = { version = "0.9.5", optional = true, features=["init_once"]}
+
+[target.'cfg(not(target_os = "android"))'.dependencies]
+mozjs = { version = "0.9.5", optional = true}