mirror of
https://github.com/servo/servo.git
synced 2025-06-09 09:03:23 +00:00
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 -->
This commit is contained in:
commit
c528039a53
4 changed files with 5 additions and 5 deletions
|
@ -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)]
|
||||
|
|
2
components/servo/Cargo.lock
generated
2
components/servo/Cargo.lock
generated
|
@ -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)",
|
||||
|
|
2
ports/cef/Cargo.lock
generated
2
ports/cef/Cargo.lock
generated
|
@ -676,7 +676,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)",
|
||||
|
|
2
ports/gonk/Cargo.lock
generated
2
ports/gonk/Cargo.lock
generated
|
@ -608,7 +608,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)",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue