Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16013 - nox:mio, r=larsbergstrom

Browse source 
Enable the debugger on Android

Apparently mio 0.6.5 now fully supports Android.

<!-- 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/16013)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-17 08:36:27 -07:00 • committed by GitHub
commit c2f4a59474
2 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/debugger/Cargo.toml
View file

@ -12,6 +12,4 @@ crate_type = ["rlib"]
[dependencies]
log = "0.3.5"
[target.'cfg(not(target_os = "android"))'.dependencies]
ws = "0.6"

16
components/debugger/lib.rs
View file

@ -4,13 +4,11 @@
#[macro_use]
extern crate log;
#[cfg(not(target_os = "android"))]
extern crate ws;
use std::sync::mpsc;
use std::sync::mpsc::channel;
use std::thread;
#[cfg(not(target_os = "android"))]
use ws::{Builder, CloseCode, Handler, Handshake};
enum Message {
@ -19,12 +17,10 @@ enum Message {
pub struct Sender(mpsc::Sender<Message>);
#[cfg(not(target_os = "android"))]
struct Connection {
sender: ws::Sender
}
#[cfg(not(target_os = "android"))]
impl Handler for Connection {
fn on_open(&mut self, _: Handshake) -> ws::Result<()> {
debug!("Connection opened.");
@ -40,7 +36,6 @@ impl Handler for Connection {
}
}
#[cfg(not(target_os = "android"))]
pub fn start_server(port: u16) -> Sender {
debug!("Starting server.");
let (sender, receiver) = channel();
@ -64,12 +59,6 @@ pub fn start_server(port: u16) -> 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) {
debug!("Shutting down server.");
let &Sender(ref sender) = sender;
@ -77,8 +66,3 @@ pub fn shutdown_server(sender: &Sender) {
warn!("Failed to shut down server.");
}
}
#[cfg(target_os = "android")]
pub fn shutdown_server(_: &Sender) {
panic!("Debugger is not supported on Android");
}