aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Bergstrom <lars@lars.com>2016-06-09 13:51:17 -0500
committerLars Bergstrom <lars@lars.com>2016-06-09 15:10:36 -0500
commitdf9539c2b08868712e86631b4521d9b4218ec0ae (patch)
tree73b825c2185687c8285b9f40db4298ba78e34423
parenta8ca2c86f0ca41fe0f6f94c2141951823306ee1a (diff)
downloadservo-df9539c2b08868712e86631b4521d9b4218ec0ae.tar.gz
servo-df9539c2b08868712e86631b4521d9b4218ec0ae.zip
Pick up libz update to fix android build
-rw-r--r--components/servo/Cargo.lock4
-rw-r--r--components/util/Cargo.toml2
-rw-r--r--ports/cef/Cargo.lock4
3 files changed, 5 insertions, 5 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index ae10f535115..00399f7b82f 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1241,7 +1241,7 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1336,7 +1336,7 @@ version = "0.0.0"
source = "git+https://github.com/servo/mozjs#2af5849a97a9f18acd482940ba3fa0c6797ed7eb"
dependencies = [
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml
index 80ea5a45397..40c8f56a64b 100644
--- a/components/util/Cargo.toml
+++ b/components/util/Cargo.toml
@@ -31,7 +31,7 @@ serde_macros = "0.7"
smallvec = "0.1"
url = {version = "1.0.0", features = ["heap_size", "serde"]}
-[target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "ios")))'.dependencies]
+[target.'cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))'.dependencies]
xdg = "2.0"
[target.'cfg(windows)'.dependencies]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 4eb9f80b4a6..04dfbcb9acd 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1147,7 +1147,7 @@ dependencies = [
[[package]]
name = "libz-sys"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"gcc 0.3.28 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1242,7 +1242,7 @@ version = "0.0.0"
source = "git+https://github.com/servo/mozjs#2af5849a97a9f18acd482940ba3fa0c6797ed7eb"
dependencies = [
"libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libz-sys 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libz-sys 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]