From 5e0e0f6f4794fb2658feaed3b7d75c0767ee94f2 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Fri, 7 Apr 2017 22:21:45 -0300 Subject: [PATCH] Android is now supported --- _includes/rustup.js | 19 +++++-------------- en-US/install.html | 15 +-------------- es-ES/install.html | 22 ---------------------- fr-FR/install.html | 13 ------------- it-IT/install.html | 13 ------------- ja-JP/install.html | 12 ------------ ko-KR/install.html | 12 ------------ pl-PL/install.html | 13 ------------- pt-BR/install.html | 15 +-------------- ru-RU/install.html | 17 ++--------------- vi-VN/install.html | 21 ++++----------------- zh-CN/install.html | 19 +++---------------- 12 files changed, 16 insertions(+), 175 deletions(-) diff --git a/_includes/rustup.js b/_includes/rustup.js index 2d331fe63..896681ebe 100644 --- a/_includes/rustup.js +++ b/_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,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 { @@ -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(); diff --git a/en-US/install.html b/en-US/install.html index 99f45ea2f..723cf92df 100644 --- a/en-US/install.html +++ b/en-US/install.html @@ -19,19 +19,6 @@

Install Rust

- - - + diff --git a/es-ES/install.html b/es-ES/install.html index eebde9ae4..0753d7a54 100644 --- a/es-ES/install.html +++ b/es-ES/install.html @@ -19,28 +19,6 @@

Instalar Rust

- - - - - - - - - - - - - - - - - + diff --git a/zh-CN/install.html b/zh-CN/install.html index 0f9986d01..f1a7fb232 100644 --- a/zh-CN/install.html +++ b/zh-CN/install.html @@ -19,29 +19,16 @@

安装 Rust

- - - +