diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-07 19:54:27 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-07 19:54:27 -0600 |
| commit | c528039a5324ffccc620bb49ad30823a1afab013 (patch) | |
| tree | 23efdaf144fe605dd7145c043f34bb8107cb6456 /components | |
| parent | af4e0a246a286325ed6bd23062e2dbeaf8bc1d50 (diff) | |
| parent | 38286246df072508a32e70887d772576c9fc9bdd (diff) | |
| download | servo-c528039a5324ffccc620bb49ad30823a1afab013.tar.gz servo-c528039a5324ffccc620bb49ad30823a1afab013.zip | |
Auto merge of #7051 - larsbergstrom:android_updates, r=mbrubeck
Update submodules and don't call setrlimit on Android
r? @mbrubeck
Fixes #6432.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7051)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
| -rw-r--r-- | components/script/lib.rs | 4 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 2 |
2 files changed, 3 insertions, 3 deletions
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 6a29e8e6e69..82c9e6626b6 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -692,7 +692,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)", |