Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-10 17:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7051 - larsbergstrom:android_updates, r=mbrubeck

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-08-07 19:54:27 -06:00
commit c528039a53
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/lib.rs
View file

@ -95,7 +95,7 @@ mod devtools;
mod horribly_inefficient_timers; mod horribly_inefficient_timers;
mod webdriver_handlers; mod webdriver_handlers;
#[cfg(any(target_os="linux", target_os="android"))] #[cfg(target_os="linux")]
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn perform_platform_specific_initialization() { fn perform_platform_specific_initialization() {
use std::mem; 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() {} fn perform_platform_specific_initialization() {}
#[allow(unsafe_code)] #[allow(unsafe_code)]

2
components/servo/Cargo.lock generated
View file

@ -692,7 +692,7 @@ dependencies = [
[[package]] [[package]]
name = "ipc-channel" name = "ipc-channel"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pcwalton/ipc-channel#13af22aa2ba8d40f80a7f91cf67a397ffc3df55b" source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
dependencies = [ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/cef/Cargo.lock generated
View file

@ -676,7 +676,7 @@ dependencies = [
[[package]] [[package]]
name = "ipc-channel" name = "ipc-channel"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pcwalton/ipc-channel#13af22aa2ba8d40f80a7f91cf67a397ffc3df55b" source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
dependencies = [ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",

2
ports/gonk/Cargo.lock generated
View file

@ -608,7 +608,7 @@ dependencies = [
[[package]] [[package]]
name = "ipc-channel" name = "ipc-channel"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pcwalton/ipc-channel#13af22aa2ba8d40f80a7f91cf67a397ffc3df55b" source = "git+https://github.com/pcwalton/ipc-channel#664e96ed6d21b19fe592f8890eb23f8e197107af"
dependencies = [ dependencies = [
"byteorder 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", "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)", "lazy_static 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",