aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/lib.rs
diff options
context:
space:
mode:
authorLars Bergstrom <lars@lars.com>2015-08-06 14:29:39 -0500
committerLars Bergstrom <lars@lars.com>2015-08-07 15:08:07 -0500
commit38286246df072508a32e70887d772576c9fc9bdd (patch)
treeb8c12742f7070dc28db87e18cc8b429604f599f1 /components/script/lib.rs
parent49cbcc97ed56724944ef713d4edb7a2df3934500 (diff)
downloadservo-38286246df072508a32e70887d772576c9fc9bdd.tar.gz
servo-38286246df072508a32e70887d772576c9fc9bdd.zip
Update submodules and don't call setrlimit on Android
Diffstat (limited to 'components/script/lib.rs')
-rw-r--r--components/script/lib.rs4
1 files changed, 2 insertions, 2 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)]