Get the magicleap build to work in CI

This commit is contained in:
Alan Jeffrey 2018-11-08 13:59:47 -06:00
parent ed0e6e1bb2
commit 08270f07fc
7 changed files with 15 additions and 22 deletions

View file

@ -13,6 +13,7 @@ path = "lib.rs"
[dependencies]
bitflags = "1.0"
bluetooth_traits = {path = "../bluetooth_traits"}
device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
embedder_traits = {path = "../embedder_traits"}
ipc-channel = "0.11"
log = "0.4"
@ -21,10 +22,4 @@ servo_rand = {path = "../rand"}
uuid = {version = "0.7", features = ["v4"]}
[features]
disable-native-bluetooth = []
[target.'cfg(feature = "disable-native-bluetooth")'.dependencies]
device = {git = "https://github.com/servo/devices", default-features = false, features = ["bluetooth-test"]}
[target.'cfg(not(feature = "disable-native-bluetooth"))'.dependencies]
device = {git = "https://github.com/servo/devices", features = ["bluetooth-test"]}
native-bluetooth = ["device/bluetooth"]

View file

@ -19,7 +19,7 @@ energy-profiling = ["profile_traits/energy-profiling"]
debugmozjs = ["script/debugmozjs"]
googlevr = ["webvr/googlevr"]
js_backtrace = ["script/js_backtrace"]
disable-native-bluetooth = ["bluetooth/disable-native-bluetooth"]
native-bluetooth = ["bluetooth/native-bluetooth"]
webrender_debugger = ["webrender/debugger"]
oculusvr = ["webvr/oculusvr"]
unstable = [