From 38286246df072508a32e70887d772576c9fc9bdd Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 6 Aug 2015 14:29:39 -0500 Subject: Update submodules and don't call setrlimit on Android --- components/script/lib.rs | 4 ++-- components/servo/Cargo.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'components') diff --git a/components/script/lib.rs b/components/script/lib.rs index 8fc23dc78b4..81a1a62b189 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -95,7 +95,7 @@ mod devtools; mod horribly_inefficient_timers; mod webdriver_handlers; -#[cfg(any(target_os="linux", target_os="android"))] +#[cfg(target_os="linux")] #[allow(unsafe_code)] fn perform_platform_specific_initialization() { use std::mem; @@ -111,7 +111,7 @@ fn perform_platform_specific_initialization() { } } -#[cfg(not(any(target_os="linux", target_os="android")))] +#[cfg(not(target_os="linux"))] fn perform_platform_specific_initialization() {} #[allow(unsafe_code)] diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index c0fe913d1f3..290dfd68b92 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -684,7 +684,7 @@ dependencies = [ [[package]] name = "ipc-channel" version = "0.1.0" -source = "git+https://github.com/pcwalton/ipc-channel#13af22aa2ba8d40f80a7f91cf67a397ffc3df55b" +source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af" dependencies = [ "byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- cgit v1.2.3