diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-19 03:14:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-19 03:14:42 -0500 |
| commit | 1ac6f435c8637d01279b51fecb535a19b639aea5 (patch) | |
| tree | 2dda8cee0ca4c1fedb44af37457590d4b7b3483b /components | |
| parent | 63a96a5d3758fea4cc5562f44777fcca393cd5ad (diff) | |
| parent | d27cfb3ee97c68bdb99bf6e3d22cac2e12a599d1 (diff) | |
| download | servo-1ac6f435c8637d01279b51fecb535a19b639aea5.tar.gz servo-1ac6f435c8637d01279b51fecb535a19b639aea5.zip | |
Auto merge of #22200 - paulrouget:mozjsup, r=jdm
Update mozjs and enable 'init_once' feature for Android
Fix #22039
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22200)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/malloc_size_of/Cargo.toml | 7 | ||||
| -rw-r--r-- | components/script/Cargo.toml | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 47d586c3092..22840c89d8a 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -33,7 +33,6 @@ 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 } @@ -47,3 +46,9 @@ 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} diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 83d827ea6a2..2b9f62ed3b9 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -63,7 +63,6 @@ hyper_serde = "0.9" image = "0.20" ipc-channel = "0.11" itertools = "0.7.6" -js = {package = "mozjs", version = "0.9.4"} jstraceable_derive = {path = "../jstraceable_derive"} keyboard-types = "0.4.3" lazy_static = "1" @@ -115,3 +114,9 @@ webvr_traits = {path = "../webvr_traits"} [target.'cfg(not(target_os = "ios"))'.dependencies] mozangle = "0.1" + +[target.'cfg(target_os = "android")'.dependencies] +js = {package = "mozjs", version = "0.9.5", features=["init_once"]} + +[target.'cfg(not(target_os = "android"))'.dependencies] +js = {package = "mozjs", version = "0.9.5"} |