mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #14270 - larsbergstrom:disable_android_debugger, r=nox
Disable the debugger on Android until mio works on Android <!-- Please describe your changes on the following line: --> r? @nox The recent change to `ws-rs` introduced a dependency on `mio`, which depends on `nix`, which does not build on Android (https://github.com/nix-rust/nix/issues/313). I've disabled the debugger in this change. Fixes #14171 cc @mmatyas --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/14270) <!-- Reviewable:end -->
This commit is contained in:
commit
9c6f6ebf3e
2 changed files with 18 additions and 0 deletions
|
@ -13,4 +13,6 @@ crate_type = ["rlib"]
|
||||||
[dependencies]
|
[dependencies]
|
||||||
log = "0.3.5"
|
log = "0.3.5"
|
||||||
util = {path = "../util"}
|
util = {path = "../util"}
|
||||||
|
|
||||||
|
[target.'cfg(not(target_os = "android"))'.dependencies]
|
||||||
ws = "0.5.3"
|
ws = "0.5.3"
|
||||||
|
|
|
@ -5,11 +5,13 @@
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate log;
|
extern crate log;
|
||||||
extern crate util;
|
extern crate util;
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
extern crate ws;
|
extern crate ws;
|
||||||
|
|
||||||
use std::sync::mpsc;
|
use std::sync::mpsc;
|
||||||
use std::sync::mpsc::channel;
|
use std::sync::mpsc::channel;
|
||||||
use util::thread::spawn_named;
|
use util::thread::spawn_named;
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
use ws::{Builder, CloseCode, Handler, Handshake};
|
use ws::{Builder, CloseCode, Handler, Handshake};
|
||||||
|
|
||||||
enum Message {
|
enum Message {
|
||||||
|
@ -18,10 +20,12 @@ enum Message {
|
||||||
|
|
||||||
pub struct Sender(mpsc::Sender<Message>);
|
pub struct Sender(mpsc::Sender<Message>);
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
struct Connection {
|
struct Connection {
|
||||||
sender: ws::Sender
|
sender: ws::Sender
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
impl Handler for Connection {
|
impl Handler for Connection {
|
||||||
fn on_open(&mut self, _: Handshake) -> ws::Result<()> {
|
fn on_open(&mut self, _: Handshake) -> ws::Result<()> {
|
||||||
debug!("Connection opened.");
|
debug!("Connection opened.");
|
||||||
|
@ -37,6 +41,7 @@ impl Handler for Connection {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
pub fn start_server(port: u16) -> Sender {
|
pub fn start_server(port: u16) -> Sender {
|
||||||
debug!("Starting server.");
|
debug!("Starting server.");
|
||||||
let (sender, receiver) = channel();
|
let (sender, receiver) = channel();
|
||||||
|
@ -60,6 +65,12 @@ pub fn start_server(port: u16) -> Sender {
|
||||||
Sender(sender)
|
Sender(sender)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "android")]
|
||||||
|
pub fn start_server(_: u16) -> Sender {
|
||||||
|
panic!("Debugger is not supported on Android");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "android"))]
|
||||||
pub fn shutdown_server(sender: &Sender) {
|
pub fn shutdown_server(sender: &Sender) {
|
||||||
debug!("Shutting down server.");
|
debug!("Shutting down server.");
|
||||||
let &Sender(ref sender) = sender;
|
let &Sender(ref sender) = sender;
|
||||||
|
@ -67,3 +78,8 @@ pub fn shutdown_server(sender: &Sender) {
|
||||||
warn!("Failed to shut down server.");
|
warn!("Failed to shut down server.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "android")]
|
||||||
|
pub fn shutdown_server(_: &Sender) {
|
||||||
|
panic!("Debugger is not supported on Android");
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue