diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2018-11-08 13:59:47 -0600 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2018-11-09 16:24:09 -0600 |
| commit | 08270f07fcb670fa078a6ef49f0b047f8299c0ab (patch) | |
| tree | 644c6f49a2cce0fd37412e1d74d005758149e665 /ports | |
| parent | ed0e6e1bb2f6ed7fd7b43b0ae935ce0e2b33016c (diff) | |
| download | servo-08270f07fcb670fa078a6ef49f0b047f8299c0ab.tar.gz servo-08270f07fcb670fa078a6ef49f0b047f8299c0ab.zip | |
Get the magicleap build to work in CI
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libmlservo/src/lib.rs | 10 | ||||
| -rw-r--r-- | ports/libsimpleservo/Cargo.toml | 1 | ||||
| -rw-r--r-- | ports/servo/Cargo.toml | 2 |
3 files changed, 5 insertions, 8 deletions
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"] |