Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5976 - larsbergstrom:osx-android-fixes, r=glennw

Browse source 
r? @metajack 

Thanks to @alexcrichton for all the work to figure out our problems here!

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5976)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-07 19:51:25 -05:00
commit 02cf89f4d3
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/servo/.cargo/config
View file

@ -2,3 +2,4 @@ paths = ["../../support/android-rs-glue"]
[target.arm-linux-androideabi] [target.arm-linux-androideabi]
linker = "../../support/android-rs-glue/apk-builder/target/debug/apk-builder" linker = "../../support/android-rs-glue/apk-builder/target/debug/apk-builder"
ar = "arm-linux-androideabi-ar"

6
components/servo/Cargo.lock generated
View file

@ -931,7 +931,7 @@ dependencies = [
[[package]] [[package]]
name = "png" name = "png"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [ dependencies = [
"gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -941,7 +941,7 @@ dependencies = [
[[package]] [[package]]
name = "png-sys" name = "png-sys"
version = "1.6.16" version = "1.6.16"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
[[package]] [[package]]
name = "profile" name = "profile"
@ -1166,7 +1166,7 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e" source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
[[package]] [[package]]
name = "time" name = "time"

6
ports/cef/Cargo.lock generated
View file

@ -920,7 +920,7 @@ dependencies = [
[[package]] [[package]]
name = "png" name = "png"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [ dependencies = [
"gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -930,7 +930,7 @@ dependencies = [
[[package]] [[package]]
name = "png-sys" name = "png-sys"
version = "1.6.16" version = "1.6.16"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
[[package]] [[package]]
name = "profile" name = "profile"
@ -1158,7 +1158,7 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e" source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
[[package]] [[package]]
name = "time" name = "time"

6
ports/gonk/Cargo.lock generated
View file

@ -792,7 +792,7 @@ dependencies = [
[[package]] [[package]]
name = "png" name = "png"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
dependencies = [ dependencies = [
"gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -802,7 +802,7 @@ dependencies = [
[[package]] [[package]]
name = "png-sys" name = "png-sys"
version = "1.6.16" version = "1.6.16"
source = "git+https://github.com/servo/rust-png#80e765ed1880ea70a8326a13964f57657b9e6fa9" source = "git+https://github.com/servo/rust-png#34fca101357da41b2b8c95f3efe6cb88a2b36bca"
[[package]] [[package]]
name = "profile" name = "profile"
@ -1029,7 +1029,7 @@ dependencies = [
[[package]] [[package]]
name = "tenacious" name = "tenacious"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/Manishearth/rust-tenacious.git#d61782e70005a9f0cdf66f366d4ec88fc563ea1e" source = "git+https://github.com/Manishearth/rust-tenacious.git#5112359cd36682cd7df3a7bb9a963299890be26c"
[[package]] [[package]]
name = "time" name = "time"