about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-21 16:36:41 +0000
committerbors <bors@rust-lang.org>2017-04-21 16:36:41 +0000
commit1785bca5137fad1f26e4d3c347cbb68408a28fa9 (patch)
tree61e50c071b66f8628a4b2016c69b0387568270f5 /src/tools
parent5695c3e9435a5872e23a6bb61c1ea0b3ada83eef (diff)
parent35dd55d00793863fc6883c3c3d23b89416273881 (diff)
Auto merge of #41445 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests

- Successful merges: #41372, #41376, #41426, #41429
- Failed merges:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/build-manifest/src/main.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
index 28c8d227073..a8cb30da435 100644
--- a/src/tools/build-manifest/src/main.rs
+++ b/src/tools/build-manifest/src/main.rs
@@ -81,6 +81,7 @@ static TARGETS: &'static [&'static str] = &[
     "s390x-unknown-linux-gnu",
     "sparc64-unknown-linux-gnu",
     "wasm32-unknown-emscripten",
+    "x86_64-linux-android",
     "x86_64-apple-darwin",
     "x86_64-apple-ios",
     "x86_64-pc-windows-gnu",