auto merge of #11656 : brson/rust/omgandroid, r=cmr

Author: bors

src/compiletest/runtest.rs

@@ -237,9 +237,15 @@ actual:\n\
 
     fn make_typecheck_args(config: &config, props: &TestProps, testfile: &Path) -> ProcArgs {
         let aux_dir = aux_output_dir_name(config, testfile);
+        let target = if props.force_host {
+            config.host.as_slice()
+        } else {
+            config.target.as_slice()
+        };
         // FIXME (#9639): This needs to handle non-utf8 paths
         let mut args = ~[~"-",
                          ~"--no-trans", ~"--lib",
+                         ~"--target=" + target,
                          ~"-L", config.build_base.as_str().unwrap().to_owned(),
                          ~"-L",
                          aux_dir.as_str().unwrap().to_owned()];

src/test/compile-fail/macro-crate-unexported-macro.rs

@@ -10,6 +10,7 @@
 
 // aux-build:macro_crate_test.rs
 // xfail-stage1
+// xfail-android
 
 #[feature(phase)];
 

src/test/compile-fail/phase-syntax-doesnt-resolve.rs

@@ -10,6 +10,7 @@
 
 // aux-build:macro_crate_test.rs
 // xfail-stage1
+// xfail-android
 
 #[feature(phase)];
 

src/test/run-pass-fulldeps/macro-crate.rs

@@ -11,6 +11,7 @@
 // aux-build:macro_crate_test.rs
 // xfail-stage1
 // xfail-fast
+// xfail-android
 
 #[feature(phase)];