Android is now supported

_includes/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,22 +44,18 @@ 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";
 
     if (platform == "unix") {
         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 {
@@ -103,8 +96,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();

en-US/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Install Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>It looks like you are running Android.</p>
-          <p>
-            The Rust compiler does not run on Android directly (yet),
-            but it does make it easy to cross-compile <em>to</em> Android.
-            Install Rust 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>
@@ -207,7 +194,7 @@ <h2>Other installation methods</h2>
         </p>
       </div>
     </div>
-    
+
     <script type="text/javascript">
       {% include rustup.js %}
     </script>

es-ES/install.html

@@ -19,28 +19,6 @@ <h1 class="rustup">Instalar Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Parece que estas ejecutando Android.</p>
-          <p>
-            The Rust compiler does not run on Android directly (yet),
-            but it does make it easy to cross-compile <em>to</em> Android.
-            Install Rust 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>
-          <p>
-            El compilador de Rust no se puede ejecutar directamente en Android (aún),
-            pero si puede compilar código <em>para</em> Android.
-            Instala Rust en una plataforma soportada y
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              sigue las instrucciones de <i>cross-compilation</i>
-            </a>
-            para compilar aplicaciones Rust para Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>No reconozco tu plataforma.</p>

fr-FR/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Installer Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Il semble que vous êtes sur Android.</p>
-          <p>
-            Le compilateur Rust ne tourne pas (encore) directement sur Android,
-	    mais il rend facile la cross-compilation <em>vers</em> Android.
-	    Installez Rust sur une plate-forme hôte supportée et
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              suivez les instructions de cross-compilation
-            </a>
-            pour compiler des applications Rust pour Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Je ne reconnais pas votre plate-forme.</p>

it-IT/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Installa Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Sembra che tu sia su un dispostivo Android.</p>
-          <p>
-            Il compilatore di Rust non funziona su Android direttamente (per ora)
-            ma permette di compilare facilmente <em>per</em> Android.
-            Installa Rust su una piattaforma supportata e
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              segui le istruzioni per la compilazione incrociata
-            </a>
-            per compilare applicazioni Rust per Android
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Non ho riconosciuto la tua piattaforma.</p>

ja-JP/install.html

@@ -19,18 +19,6 @@ <h1 class="rustup">Rustのインストール</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>Androidをお使いのようですね。</p>
-          <p>
-            Rustのコンパイラは（まだ）Androidでは直接動きませんが、Android<em>へ</em>クロスコンパイルすることは簡単に出来ます。
-            Android向けのRustアプリケーションを作るにはRustをサポートされているプラットフォーム上でインストールして
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              クロスコンパイルのガイド
-            </a>
-            に従って下さい。
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
             <!-- unrecognized platform: ask for help -->
             <p>お使いのプラットフォームを認識出来ませんでした。</p>

ko-KR/install.html

@@ -19,18 +19,6 @@ <h1 class="rustup">Rust 설치</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>안드로이드를 사용하시는 듯 하네요.</p>
-          <p>
-            Rust 컴파일러는 (아직) 안드로이드에서 직접 동작하진 않지만,
-            안드로이드<em>로</em> 크로스컴파일하는 것은 쉽게 할 수 있습니다.
-            안드로이드용 Rust 애플리케이션을 빌드하려면
-            지원되는 호스트 플랫폼에서 Rust를 설치한 뒤
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              크로스컴파일 방법을 따르십시오</a>.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>무슨 플랫폼을 사용하시는지 알아내지 못 했습니다.</p>

pl-PL/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Zainstaluj Rusta</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Wygląda na to, że używasz systemu Android.</p>
-          <p>
-            Kompilator Rusta nie działa na systemie Android bezpośrednio (jeszcze),
-            ale pozwala na prostą kompilację <em>na</em> system Android.
-            Zainstaluj Rusta na wspieranej platformie oraz
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              kieruj się instrukcjami kompilacji
-            </a>
-            aby zbudować aplikację napisaną w języku Rust na system Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <p>Nie rozpoznaję Twojego systemu.</p>
           <p>

pt-BR/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Instale Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;">
-         <p>Parece que você está usando Android.</p>
-          <p>
-            O compilador Rust não executa em Android diretamente (ainda),
-            mas ele facilita fazer compliação cruzada <em>para</em> Android.
-            Instale Rust em uma plataforma suportada e
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              siga as instruções de compilação cruzada
-            </a>
-            para construir aplicações Rust para Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Não reconheci sua plataforma.</p>
@@ -41,7 +28,7 @@ <h1 class="rustup">Instale Rust</h1>
             <a href="https://github.com/rust-lang/rust-www/issues/new">reporte um problema</a>,
             junto com os seguintes valores:
           </p>
-          
+
           <div>
             <div>navigator.platform:</div>
             <div id="nav-plat"></div>

ru-RU/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Установка Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>Похоже, вы зашли с Android.</p>
-          <p>
-            Компилятор Rust пока не работает на Android,
-            но вы легко можете кросс-компилировать программы <em>на</em> Android.
-            Установите Rust на поддерживаемой хостовой платформе и
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              следуйте инструкциям по кросс-компиляции
-            </a>
-            чтобы собирать приложения на Rust для Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Мы не распознали, на какой вы платформе.</p>
@@ -41,7 +28,7 @@ <h1 class="rustup">Установка Rust</h1>
             <a href="https://github.com/rust-lang/rust-www/issues/new">сообщите о проблеме</a>,
             вместе с значениями этих переменных:
           </p>
-          
+
           <div>
             <div>navigator.platform:</div>
             <div id="nav-plat"></div>
@@ -207,7 +194,7 @@ <h2>Other installation methods</h3>
         </p>
       </div>
     </div>
-    
+
     <script type="text/javascript">
       {% include rustup.js %}
     </script>

vi-VN/install.html

@@ -19,19 +19,6 @@ <h1 class="rustup">Cài đặt Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>Bạn đang sử dựng Android phải không ?.</p>
-          <p>
-            Trình biên dịch Rust không chạy trực tiếp trên Android,
-            nhưng bạn có thể compile để chạy trên Android.
-            Cài đặt các bộ platform Rust đã hỗ trợ và
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-              làm theo các hướng dẫn đối với việc compile nhiều nền tảng
-            </a>
-            để xây dựng ứng dụng cho Android.
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>Tôi không biết nền tảng mình đang chạy là gì.</p>
@@ -41,7 +28,7 @@ <h1 class="rustup">Cài đặt Rust</h1>
             <a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
             theo mẫu sau:
           </p>
-          
+
           <div>
             <div>navigator.platform:</div>
             <div id="nav-plat"></div>
@@ -152,12 +139,12 @@ <h3>Cấu hình biến mỗi trường <code>PATH</code></h3>
           sẽ cấu hình biến môi trường
           <code>PATH</code>, nhưng với sự khác nhau giữ các nền tảng,
           command shells, và lỗi của <code>rustup</code>, những thay đổi
-          với <code>PATH</code> sẽ không bị ảnh hưởng cho đến khi console được khởi động lại, 
+          với <code>PATH</code> sẽ không bị ảnh hưởng cho đến khi console được khởi động lại,
           hoặc user đã logged out, hoặc có thể không thành công ở tất cả.
         </p>
 
         <p>
-          Nếu sau khi cài đặt, bạn chạy lệnh <code>rustc --version</code> ở console thất bại, 
+          Nếu sau khi cài đặt, bạn chạy lệnh <code>rustc --version</code> ở console thất bại,
           đây là lý do có khả năng nhất.
         </p>
 
@@ -203,7 +190,7 @@ <h2>Cách cài đặt khác</h3>
         </p>
       </div>
     </div>
-    
+
     <script type="text/javascript">
       {% include rustup.js %}
     </script>

zh-CN/install.html

@@ -19,29 +19,16 @@ <h1 class="rustup">安装 Rust</h1>
           </p>
         </div>
 
-        <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>您似乎正在安卓(Android)操作系统上浏览本页面</p>
-          <p>
-            Rust 编译器(暂时)不能直接在安卓(Android)上运行，
-            但它确实使得它很容易交叉编译<em>到</em>安卓(Android)上。
-            请在支持的主机平台上安装 Rust ，
-            <a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
-            遵循交叉编译指令
-            </a>
-            来构建安卓(Android)平台的 Rust 应用程序。
-          </p>
-        </div>
-
         <div id="platform-instructions-unknown" class="instructions" style="display: none;">
           <!-- unrecognized platform: ask for help -->
           <p>无法识别您的平台</p>
           <p>
-            可以运行在 Windows, Linux, Mac OS X, FreeBSD 和 NetBSD 上。 
+            可以运行在 Windows, Linux, Mac OS X, FreeBSD 和 NetBSD 上。
             如果您正在这些平台上，并且看到这句话，请您
             <a href="https://github.com/rust-lang/rust-www/issues/new">报告问题(issue)</a>,
             并且提供以下信息：
           </p>
-          
+
           <div>
             <div>navigator.platform:(浏览器.平台)</div>
             <div id="nav-plat"></div>
@@ -201,7 +188,7 @@ <h2>其他安装方法</h3>
         </p>
       </div>
     </div>
-    
+
     <script type="text/javascript">
       {% include rustup.js %}
     </script>