diff --git a/.gitmodules b/.gitmodules index cbc43176bd7..62bfa714d71 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/components/servo/.cargo/config b/components/servo/.cargo/config index 5ad542ef4e2..102a11443bb 100644 --- a/components/servo/.cargo/config +++ b/components/servo/.cargo/config @@ -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" diff --git a/support/time b/support/time new file mode 160000 index 00000000000..b8c8f84262d --- /dev/null +++ b/support/time @@ -0,0 +1 @@ +Subproject commit b8c8f84262de6d412befabee4f62dbf8d4fe50be