aboutsummaryrefslogtreecommitdiffstats
path: root/components/debugger/lib.rs
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2017-03-17 16:12:11 +0100
committerAnthony Ramine <n.oxyde@gmail.com>2017-03-17 16:36:06 +0100
commit60a7f4635089b14cf9777958db10aa5703d87022 (patch)
tree89ac4cdb0b91a29c6b426ea206dc655f37efdb74 /components/debugger/lib.rs
parentf873a4aba5beae1f3a7529dee1d23070846a59fc (diff)
downloadservo-60a7f4635089b14cf9777958db10aa5703d87022.tar.gz
servo-60a7f4635089b14cf9777958db10aa5703d87022.zip
Enable the debugger on Android
Apparently mio 0.6.5 now fully supports Android.
Diffstat (limited to 'components/debugger/lib.rs')
-rw-r--r--components/debugger/lib.rs16
1 files changed, 0 insertions, 16 deletions
diff --git a/components/debugger/lib.rs b/components/debugger/lib.rs
index 25b3c4890a6..ec0e5ba0e80 100644
--- a/components/debugger/lib.rs
+++ b/components/debugger/lib.rs
@@ -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");
-}