Auto merge of #22060 - jdm:ml, r=asajeffrey

Add a build switch to disable the native bluetooth backend.

Fixes #22059.

<!-- 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/22060)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-11-01 02:23:53 -04:00 committed by GitHub
commit 126ed26171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 3 deletions

View file

@ -12,10 +12,18 @@ 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"
servo_config = {path = "../config"}
servo_rand = {path = "../rand"}
uuid = {version = "0.6", 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"]}

View file

@ -18,6 +18,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"]
webrender_debugger = ["webrender/debugger"]
oculusvr = ["webvr/oculusvr"]
unstable = [

View file

@ -25,6 +25,7 @@ ProductName = "Servo"
[features]
default = ["unstable", "default-except-unstable"]
default-except-unstable = ["webdriver", "max_log_level"]
disable-native-bluetooth = ["libservo/disable-native-bluetooth"]
max_log_level = ["log/release_max_level_info"]
webdriver = ["libservo/webdriver"]
energy-profiling = ["libservo/energy-profiling"]

View file

@ -248,8 +248,10 @@ class MachCommands(CommandBase):
if android:
target = self.config["android"]["target"]
if magicleap and not target:
target = "aarch64-linux-android"
if magicleap:
features += ["disable-native-bluetooth"]
if not target:
target = "aarch64-linux-android"
if target:
if self.config["tools"]["use-rustup"]: