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

@ -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 _);
}

View file

@ -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"]

View file

@ -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"]