Get the magicleap build to work in CI

7 files changed, 15 insertions, 22 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ff284c70ca7..b1e23405138 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -230,7 +230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "blurmac"
 version = "0.1.0"
-source = "git+https://github.com/servo/devices#967e13521ac9825a6664f1ed3fb2d2025cac0371"
+source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778"
 dependencies = [
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "objc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -820,7 +820,7 @@ dependencies = [
 [[package]]
 name = "device"
 version = "0.0.1"
-source = "git+https://github.com/servo/devices#967e13521ac9825a6664f1ed3fb2d2025cac0371"
+source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778"
 dependencies = [
  "blurdroid 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "blurmac 0.1.0 (git+https://github.com/servo/devices)",
diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml
index b1e8680eac4..630982f4541 100644
--- a/components/bluetooth/Cargo.toml
+++ b/components/bluetooth/Cargo.toml
@@ -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"]
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index c7be421f17c..6244fb2926c 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -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 = [
diff --git a/ports/libmlservo/src/lib.rs b/ports/libmlservo/src/lib.rs
index e094d856d47..a84bd054c59 100644
--- a/ports/libmlservo/src/lib.rs
+++ b/ports/libmlservo/src/lib.rs
@@ -2,18 +2,14 @@
  * 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/. */
 
-extern crate egl;
-#[macro_use]
-extern crate log;
-extern crate servo;
-extern crate smallvec;
-
 use egl::egl::EGLContext;
 use egl::egl::EGLDisplay;
 use egl::egl::EGLSurface;
 use egl::egl::MakeCurrent;
 use egl::egl::SwapBuffers;
 use egl::eglext::eglGetProcAddress;
+use log::info;
+use log::warn;
 use servo::compositing::windowing::AnimationState;
 use servo::compositing::windowing::EmbedderCoordinates;
 use servo::compositing::windowing::MouseWindowEvent;
@@ -483,7 +479,7 @@ impl log::Log for MLLogger {
             log::Level::Debug => MLLogLevel::Debug,
             log::Level::Trace => MLLogLevel::Verbose,
         };
-        let mut msg = SmallVec::<[c_char; 128]>::new();
+        let mut msg = SmallVec::<[u8; 128]>::new();
         write!(msg, "{}\0", record.args());
         (self.0)(lvl, &msg[0] as *const _ as *const _);
     }
diff --git a/ports/libsimpleservo/Cargo.toml b/ports/libsimpleservo/Cargo.toml
index 60e8c0596e7..a2f6805adf1 100644
--- a/ports/libsimpleservo/Cargo.toml
+++ b/ports/libsimpleservo/Cargo.toml
@@ -43,5 +43,6 @@ debugmozjs = ["libservo/debugmozjs"]
 unstable = ["libservo/unstable"]
 googlevr = ["libservo/googlevr"]
 oculusvr = ["libservo/oculusvr"]
+native-bluetooth = ["libservo/native-bluetooth"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
 js_backtrace = ["libservo/js_backtrace"]
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
index 61f31834cba..35d55e2ebe7 100644
--- a/ports/servo/Cargo.toml
+++ b/ports/servo/Cargo.toml
@@ -29,7 +29,7 @@ ProductName = "Servo"
 [features]
 default = ["unstable", "default-except-unstable"]
 default-except-unstable = ["webdriver", "max_log_level"]
-disable-native-bluetooth = ["libservo/disable-native-bluetooth"]
+native-bluetooth = ["libservo/native-bluetooth"]
 max_log_level = ["log/release_max_level_info"]
 webdriver = ["libservo/webdriver"]
 energy-profiling = ["libservo/energy-profiling"]
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index ab9c769fb9f..b6b0a413026 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -248,10 +248,11 @@ class MachCommands(CommandBase):
         if android:
             target = self.config["android"]["target"]
 
-        if magicleap:
-            features += ["disable-native-bluetooth"]
-            if not target:
-                target = "aarch64-linux-android"
+        if not magicleap:
+            features += ["native-bluetooth"]
+
+        if magicleap and not target:
+            target = "aarch64-linux-android"
 
         if target:
             if self.config["tools"]["use-rustup"]: