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

Bug 1322769 - Add a "servo" feature; r=manishearth

Browse source 
MozReview-Commit-ID: A9dNTxNkl39

--HG--
extra : rebase_source : b9d115025beb00d596d34ca8d414a69b8ea2ba07
extra : source : f142ed52978bfab6407c252b7c56c53d0c3fcecd
This commit is contained in:
Gregory Szorc 2017-02-02 15:30:16 -08:00
parent c1cc98fed4
commit aaae03d7a8
5 changed files with 10 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
config/rules.mk
View file

@ -919,6 +919,9 @@ endif
ifdef MOZ_CARGO_SUPPORTS_FROZEN ifdef MOZ_CARGO_SUPPORTS_FROZEN
cargo_build_flags += --frozen cargo_build_flags += --frozen
endif endif
ifdef MOZ_STYLO
cargo_build_flags += --features=servo
endif
cargo_build_flags += --manifest-path $(CARGO_FILE) cargo_build_flags += --manifest-path $(CARGO_FILE)
ifdef BUILD_VERBOSE_LOG ifdef BUILD_VERBOSE_LOG

1
toolkit/library/gtest/rust/Cargo.toml
View file

@ -7,6 +7,7 @@ description = "Testing code for libgkrust"
[features] [features]
bindgen = ["gkrust-shared/bindgen"] bindgen = ["gkrust-shared/bindgen"]
servo = ["gkrust-shared/servo"]
[dependencies] [dependencies]
mp4parse-gtest = { path = "../../../../dom/media/gtest" } mp4parse-gtest = { path = "../../../../dom/media/gtest" }

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

@ -7,6 +7,7 @@ description = "Rust code for libxul"
[features] [features]
bindgen = ["gkrust-shared/bindgen"] bindgen = ["gkrust-shared/bindgen"]
servo = ["gkrust-shared/servo"]
[dependencies] [dependencies]
gkrust-shared = { path = "shared" } gkrust-shared = { path = "shared" }

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

@ -6,7 +6,7 @@ license = "MPL-2.0"
description = "Shared Rust code for libxul" description = "Shared Rust code for libxul"
[dependencies] [dependencies]
geckoservo = { path = "../../../../servo/ports/geckolib" } geckoservo = { path = "../../../../servo/ports/geckolib", optional = true }
mp4parse_capi = { path = "../../../../media/libstagefright/binding/mp4parse_capi" } mp4parse_capi = { path = "../../../../media/libstagefright/binding/mp4parse_capi" }
nsstring = { path = "../../../../xpcom/rust/nsstring" } nsstring = { path = "../../../../xpcom/rust/nsstring" }
rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" } rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" }
@ -14,6 +14,7 @@ rust_url_capi = { path = "../../../../netwerk/base/rust-url-capi" }
[features] [features]
default = [] default = []
bindgen = ["geckoservo/bindgen"] bindgen = ["geckoservo/bindgen"]
servo = ["geckoservo"]
[lib] [lib]
path = "lib.rs" path = "lib.rs"

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

@ -2,6 +2,9 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
#[cfg(feature="servo")]
extern crate geckoservo;
extern crate mp4parse_capi; extern crate mp4parse_capi;
extern crate nsstring; extern crate nsstring;
extern crate rust_url_capi; extern crate rust_url_capi;