diff --git a/components/debugger/Cargo.toml b/components/debugger/Cargo.toml index 20f5779b274..d098148528c 100644 --- a/components/debugger/Cargo.toml +++ b/components/debugger/Cargo.toml @@ -12,6 +12,4 @@ crate_type = ["rlib"] [dependencies] log = "0.3.5" - -[target.'cfg(not(target_os = "android"))'.dependencies] ws = "0.6" 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); -#[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"); -}