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

Enable the debugger on Android

Browse source 
Apparently mio 0.6.5 now fully supports Android.
This commit is contained in:
Anthony Ramine 2017-03-17 16:12:11 +01:00
parent f873a4aba5
commit 60a7f46350
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] [dependencies]
log = "0.3.5" log = "0.3.5"
[target.'cfg(not(target_os = "android"))'.dependencies]
ws = "0.6" ws = "0.6"

16
components/debugger/lib.rs
View file

@ -4,13 +4,11 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
#[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 std::thread; use std::thread;
#[cfg(not(target_os = "android"))]
use ws::{Builder, CloseCode, Handler, Handshake}; use ws::{Builder, CloseCode, Handler, Handshake};
enum Message { enum Message {
@ -19,12 +17,10 @@ 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.");
@ -40,7 +36,6 @@ 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();
@ -64,12 +59,6 @@ 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;
@ -77,8 +66,3 @@ 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");
}