auto merge of #4441 : glennw/servo/android-time-hack, r=larsbergstrom

This commit is contained in:
bors-servo 2014-12-18 18:00:59 -07:00
commit 9aaae08c36
3 changed files with 12 additions and 0 deletions

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "support/android-rs-glue"]
path = support/android-rs-glue
url = https://github.com/servo/android-rs-glue
[submodule "support/time"]
path = support/time
url = https://github.com/servo/time

View file

@ -1,2 +1,10 @@
# FIXME: Remove this next rustup. This is a temporary
# hack to allow android cross compilation to work. When
# this is removed, the support/time submodule can also
# be removed!
paths = [
"../../support/time"
]
[target.arm-linux-androideabi]
linker = "../../support/android-rs-glue/apk-builder/target/apk-builder"

1
support/time Submodule

@ -0,0 +1 @@
Subproject commit b8c8f84262de6d412befabee4f62dbf8d4fe50be