From 45057d34fc3e2e27d9bf3e496dcf3bf00ae27973 Mon Sep 17 00:00:00 2001
From: Marco A L Barbosa <malbarbo@gmail.com>
Date: Thu, 6 Apr 2017 08:20:31 -0300
Subject: [PATCH 1/2] Add links to android binaries to README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index b154da92ff8..1844255e1de 100644
--- a/README.md
+++ b/README.md
@@ -516,13 +516,17 @@ $ curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly
 If you prefer you can directly download `rustup-init` for the
 platform of your choice:
 
+- [aarch64-linux-android](https://static.rust-lang.org/rustup/dist/aarch64-linux-android/rustup-init)
 - [aarch64-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-gnu/rustup-init)
+- [arm-linux-androideabi](https://static.rust-lang.org/rustup/dist/arm-linux-androideabi/rustup-init)
 - [arm-unknown-linux-gnueabi](https://static.rust-lang.org/rustup/dist/arm-unknown-linux-gnueabi/rustup-init)
 - [arm-unknown-linux-gnueabihf](https://static.rust-lang.org/rustup/dist/arm-unknown-linux-gnueabihf/rustup-init)
+- [armv7-linux-androideabi](https://static.rust-lang.org/rustup/dist/armv7-linux-androideabi/rustup-init)
 - [armv7-unknown-linux-gnueabihf](https://static.rust-lang.org/rustup/dist/armv7-unknown-linux-gnueabihf/rustup-init)
 - [i686-apple-darwin](https://static.rust-lang.org/rustup/dist/i686-apple-darwin/rustup-init)
 - [i686-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/i686-pc-windows-gnu/rustup-init.exe)
 - [i686-pc-windows-msvc](https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe)<sup>[†](#vs2015)</sup>
+- [i686-linux-android](https://static.rust-lang.org/rustup/dist/i686-linux-android/rustup-init)
 - [i686-unknown-linux-gnu](https://static.rust-lang.org/rustup/dist/i686-unknown-linux-gnu/rustup-init)
 - [x86_64-apple-darwin](https://static.rust-lang.org/rustup/dist/x86_64-apple-darwin/rustup-init)
 - [x86_64-pc-windows-gnu](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe)

From fc644e7d8fe34491fc2fd6d70bef0f0509f0dcff Mon Sep 17 00:00:00 2001
From: Marco A L Barbosa <malbarbo@gmail.com>
Date: Thu, 6 Apr 2017 08:27:59 -0300
Subject: [PATCH 2/2] We now support android, update install info

---
 www/index.html | 13 -------------
 www/rustup.js  | 19 +++++--------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/www/index.html b/www/index.html
index 09158b64320..a2af54120df 100644
--- a/www/index.html
+++ b/www/index.html
@@ -36,19 +36,6 @@
   </p>
 </div>
 
-<div id="platform-instructions-android" class="instructions" style="display: none;">
-  <p>It looks like you are running Android.</p>
-  <p>
-    rustup does not run on Android directly (yet),
-    but it does make it easy to cross-compile <em>to</em> Android.
-    Install rustup on a supported host platform and
-    <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-      follow the cross-compilation instructions
-    </a>
-    to build Rust applications for Android.
-  </p>
-</div>
-
 <div id="platform-instructions-unknown" class="instructions" style="display: none;">
   <!-- unrecognized platform: ask for help -->
   <p>I don't recognize your platform.</p>
diff --git a/www/rustup.js b/www/rustup.js
index 2cb1e711a70..84435228908 100644
--- a/www/rustup.js
+++ b/www/rustup.js
@@ -1,9 +1,5 @@
 var platform_override = null;
 
-function android_or_unix() {
-  return (navigator.appVersion.indexOf("Android") != -1) ? "android" : "unix";
-}
-
 function detect_platform() {
     "use strict";
 
@@ -14,11 +10,12 @@ function detect_platform() {
     var os = "unknown";
 
     if (navigator.platform == "Linux x86_64") {os = "unix";}
-    if (navigator.platform == "Linux i686") {os = android_or_unix();}
+    if (navigator.platform == "Linux i686") {os = "unix";}
     if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
-    if (navigator.platform == "Linux aarch64") {os = android_or_unix();}
-    if (navigator.platform == "Linux armv6l") {os = android_or_unix();}
-    if (navigator.platform == "Linux armv7l") {os = android_or_unix();}
+    if (navigator.platform == "Linux aarch64") {os = "unix";}
+    if (navigator.platform == "Linux armv6l") {os = "unix";}
+    if (navigator.platform == "Linux armv7l") {os = "unix";}
+    if (navigator.platform == "Linux armv8l") {os = "unix";}
     if (navigator.platform == "Linux ppc64") {os = "unix";}
     if (navigator.platform == "Linux mips") {os = "unix";}
     if (navigator.platform == "Linux mips64") {os = "unix";}
@@ -47,13 +44,11 @@ function adjust_for_platform() {
 
     var unix_div = document.getElementById("platform-instructions-unix");
     var win_div = document.getElementById("platform-instructions-win");
-    var android_div = document.getElementById("platform-instructions-android");
     var unknown_div = document.getElementById("platform-instructions-unknown");
     var default_div = document.getElementById("platform-instructions-default");
 
     unix_div.style.display = "none";
     win_div.style.display = "none";
-    android_div.style.display = "none";
     unknown_div.style.display = "none";
     default_div.style.display = "none";
 
@@ -61,8 +56,6 @@ function adjust_for_platform() {
         unix_div.style.display = "block";
     } else if (platform == "win") {
         win_div.style.display = "block";
-    } else if (platform == "android") {
-        android_div.style.display = "block";
     } else if (platform == "unknown") {
         unknown_div.style.display = "block";
     } else {
@@ -80,8 +73,6 @@ function cycle_platform() {
     } else if (platform_override == "win") {
         platform_override = "unix";
     } else if (platform_override == "unix") {
-        platform_override = "android";
-    } else if (platform_override == "android") {
         platform_override = "default";
     }
     adjust_for_platform();