Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 5d330e5

Browse files
brsonbrson
authored
Merge pull request #775 from malbarbo/android
Android is now supported
2 parents eebd915 + 5e0e0f6 commit 5d330e5

File tree

12 files changed

+16
-175
lines changed

12 files changed

+16
-175
lines changed

‎_includes/rustup.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
var platform_override = null;
22

3-
function android_or_unix() {
4-
return (navigator.appVersion.indexOf("Android") != -1) ? "android" : "unix";
5-
}
6-
73
function detect_platform() {
84
"use strict";
95

@@ -14,11 +10,12 @@ function detect_platform() {
1410
var os = "unknown";
1511

1612
if (navigator.platform == "Linux x86_64") {os = "unix";}
17-
if (navigator.platform == "Linux i686") {os = android_or_unix();}
13+
if (navigator.platform == "Linux i686") {os = "unix";}
1814
if (navigator.platform == "Linux i686 on x86_64") {os = "unix";}
19-
if (navigator.platform == "Linux aarch64") {os = android_or_unix();}
20-
if (navigator.platform == "Linux armv6l") {os = android_or_unix();}
21-
if (navigator.platform == "Linux armv7l") {os = android_or_unix();}
15+
if (navigator.platform == "Linux aarch64") {os = "unix";}
16+
if (navigator.platform == "Linux armv6l") {os = "unix";}
17+
if (navigator.platform == "Linux armv7l") {os = "unix";}
18+
if (navigator.platform == "Linux armv8l") {os = "unix";}
2219
if (navigator.platform == "Linux ppc64") {os = "unix";}
2320
if (navigator.platform == "Linux mips") {os = "unix";}
2421
if (navigator.platform == "Linux mips64") {os = "unix";}
@@ -47,22 +44,18 @@ function adjust_for_platform() {
4744

4845
var unix_div = document.getElementById("platform-instructions-unix");
4946
var win_div = document.getElementById("platform-instructions-win");
50-
var android_div = document.getElementById("platform-instructions-android");
5147
var unknown_div = document.getElementById("platform-instructions-unknown");
5248
var default_div = document.getElementById("platform-instructions-default");
5349

5450
unix_div.style.display = "none";
5551
win_div.style.display = "none";
56-
android_div.style.display = "none";
5752
unknown_div.style.display = "none";
5853
default_div.style.display = "none";
5954

6055
if (platform == "unix") {
6156
unix_div.style.display = "block";
6257
} else if (platform == "win") {
6358
win_div.style.display = "block";
64-
} else if (platform == "android") {
65-
android_div.style.display = "block";
6659
} else if (platform == "unknown") {
6760
unknown_div.style.display = "block";
6861
} else {
@@ -103,8 +96,6 @@ function cycle_platform() {
10396
} else if (platform_override == "win") {
10497
platform_override = "unix";
10598
} else if (platform_override == "unix") {
106-
platform_override = "android";
107-
} else if (platform_override == "android") {
10899
platform_override = "default";
109100
}
110101
adjust_for_platform();

‎en-US/install.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Install Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>It looks like you are running Android.</p>
24-
<p>
25-
The Rust compiler does not run on Android directly (yet),
26-
but it does make it easy to cross-compile <em>to</em> Android.
27-
Install Rust on a supported host platform and
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
follow the cross-compilation instructions
30-
</a>
31-
to build Rust applications for Android.
32-
</p>
33-
</div>
34-
3522
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3623
<!-- unrecognized platform: ask for help -->
3724
<p>I don't recognize your platform.</p>
@@ -207,7 +194,7 @@ <h2>Other installation methods</h2>
207194
</p>
208195
</div>
209196
</div>
210-
197+
211198
<script type="text/javascript">
212199
{% include rustup.js %}
213200
</script>

‎es-ES/install.html

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,6 @@ <h1 class="rustup">Instalar Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>Parece que estas ejecutando Android.</p>
24-
<p>
25-
The Rust compiler does not run on Android directly (yet),
26-
but it does make it easy to cross-compile <em>to</em> Android.
27-
Install Rust on a supported host platform and
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
follow the cross-compilation instructions
30-
</a>
31-
to build Rust applications for Android.
32-
</p>
33-
<p>
34-
El compilador de Rust no se puede ejecutar directamente en Android (aún),
35-
pero si puede compilar código <em>para</em> Android.
36-
Instala Rust en una plataforma soportada y
37-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
38-
sigue las instrucciones de <i>cross-compilation</i>
39-
</a>
40-
para compilar aplicaciones Rust para Android.
41-
</p>
42-
</div>
43-
4422
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
4523
<!-- unrecognized platform: ask for help -->
4624
<p>No reconozco tu plataforma.</p>

‎fr-FR/install.html

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Installer Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>Il semble que vous êtes sur Android.</p>
24-
<p>
25-
Le compilateur Rust ne tourne pas (encore) directement sur Android,
26-
mais il rend facile la cross-compilation <em>vers</em> Android.
27-
Installez Rust sur une plate-forme hôte supportée et
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
suivez les instructions de cross-compilation
30-
</a>
31-
pour compiler des applications Rust pour Android.
32-
</p>
33-
</div>
34-
3522
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3623
<!-- unrecognized platform: ask for help -->
3724
<p>Je ne reconnais pas votre plate-forme.</p>

‎it-IT/install.html

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Installa Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>Sembra che tu sia su un dispostivo Android.</p>
24-
<p>
25-
Il compilatore di Rust non funziona su Android direttamente (per ora)
26-
ma permette di compilare facilmente <em>per</em> Android.
27-
Installa Rust su una piattaforma supportata e
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
segui le istruzioni per la compilazione incrociata
30-
</a>
31-
per compilare applicazioni Rust per Android
32-
</p>
33-
</div>
34-
3522
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3623
<!-- unrecognized platform: ask for help -->
3724
<p>Non ho riconosciuto la tua piattaforma.</p>

‎ja-JP/install.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ <h1 class="rustup">Rustのインストール</h1>
1919
</p>
2020
</div>
2121

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

‎ko-KR/install.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ <h1 class="rustup">Rust 설치</h1>
1919
</p>
2020
</div>
2121

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

‎pl-PL/install.html

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Zainstaluj Rusta</h1>
1919
</p>
2020
</div>
2121

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

‎pt-BR/install.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Instale Rust</h1>
1919
</p>
2020
</div>
2121

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

‎ru-RU/install.html

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Установка Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>Похоже, вы зашли с Android.</p>
24-
<p>
25-
Компилятор Rust пока не работает на Android,
26-
но вы легко можете кросс-компилировать программы <em>на</em> Android.
27-
Установите Rust на поддерживаемой хостовой платформе и
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
следуйте инструкциям по кросс-компиляции
30-
</a>
31-
чтобы собирать приложения на Rust для Android.
32-
</p>
33-
</div>
34-
3522
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3623
<!-- unrecognized platform: ask for help -->
3724
<p>Мы не распознали, на какой вы платформе.</p>
@@ -41,7 +28,7 @@ <h1 class="rustup">Установка Rust</h1>
4128
<a href="https://github.com/rust-lang/rust-www/issues/new">сообщите о проблеме</a>,
4229
вместе с значениями этих переменных:
4330
</p>
44-
31+
4532
<div>
4633
<div>navigator.platform:</div>
4734
<div id="nav-plat"></div>
@@ -207,7 +194,7 @@ <h2>Other installation methods</h3>
207194
</p>
208195
</div>
209196
</div>
210-
197+
211198
<script type="text/javascript">
212199
{% include rustup.js %}
213200
</script>

‎vi-VN/install.html

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ <h1 class="rustup">Cài đặt Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
23-
<p>Bạn đang sử dựng Android phải không ?.</p>
24-
<p>
25-
Trình biên dịch Rust không chạy trực tiếp trên Android,
26-
nhưng bạn có thể compile để chạy trên Android.
27-
Cài đặt các bộ platform Rust đã hỗ trợ và
28-
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
làm theo các hướng dẫn đối với việc compile nhiều nền tảng
30-
</a>
31-
để xây dựng ứng dụng cho Android.
32-
</p>
33-
</div>
34-
3522
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3623
<!-- unrecognized platform: ask for help -->
3724
<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>
4128
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
4229
theo mẫu sau:
4330
</p>
44-
31+
4532
<div>
4633
<div>navigator.platform:</div>
4734
<div id="nav-plat"></div>
@@ -152,12 +139,12 @@ <h3>Cấu hình biến mỗi trường <code>PATH</code></h3>
152139
sẽ cấu hình biến môi trường
153140
<code>PATH</code>, nhưng với sự khác nhau giữ các nền tảng,
154141
command shells, và lỗi của <code>rustup</code>, những thay đổi
155-
với <code>PATH</code> sẽ không bị ảnh hưởng cho đến khi console được khởi động lại,
142+
với <code>PATH</code> sẽ không bị ảnh hưởng cho đến khi console được khởi động lại,
156143
hoặc user đã logged out, hoặc có thể không thành công ở tất cả.
157144
</p>
158145

159146
<p>
160-
Nếu sau khi cài đặt, bạn chạy lệnh <code>rustc --version</code> ở console thất bại,
147+
Nếu sau khi cài đặt, bạn chạy lệnh <code>rustc --version</code> ở console thất bại,
161148
đây là lý do có khả năng nhất.
162149
</p>
163150

@@ -203,7 +190,7 @@ <h2>Cách cài đặt khác</h3>
203190
</p>
204191
</div>
205192
</div>
206-
193+
207194
<script type="text/javascript">
208195
{% include rustup.js %}
209196
</script>

‎zh-CN/install.html

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,16 @@ <h1 class="rustup">安装 Rust</h1>
1919
</p>
2020
</div>
2121

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

0 commit comments

Comments
 (0)