Skip to content

Commit

Permalink
We now support android, update install info
Browse files Browse the repository at this point in the history
  • Loading branch information
malbarbo committed Apr 6, 2017
1 parent 45057d3 commit fc644e7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 27 deletions.
13 changes: 0 additions & 13 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 5 additions & 14 deletions www/rustup.js
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -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";}
Expand Down Expand Up @@ -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 {
Expand All @@ -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();
Expand Down

0 comments on commit fc644e7

Please sign in to comment.