Skip to content

Update the Android Docker files to Ubuntu 22.04 #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2022
Merged

Update the Android Docker files to Ubuntu 22.04 #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f5d5f2
Update the Android Docker files to Ubuntu 22.04
chriswailes Sep 30, 2022
76e0be1
Remove bench_black_box from the list of unstable features
chriswailes Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/android-install-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ set -ex
# which apparently magically accepts the licenses.

mkdir sdk
curl --retry 5 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O
unzip -d sdk sdk-tools-linux-3859397.zip
curl --retry 5 https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -O
unzip -d sdk sdk-tools-linux-4333796.zip

case "$1" in
arm | armv7)
Expand Down
11 changes: 5 additions & 6 deletions ci/docker/aarch64-linux-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
FROM ubuntu:16.04
FROM ubuntu:22.04

RUN dpkg --add-architecture i386 && \
apt-get update && \
RUN apt-get update && \
apt-get install -y --no-install-recommends \
file \
make \
curl \
ca-certificates \
python \
python-is-python3 \
unzip \
expect \
openjdk-9-jre \
libstdc++6:i386 \
openjdk-8-jre \
libstdc++6-i386-cross \
libpulse0 \
gcc \
libc6-dev
Expand Down
11 changes: 5 additions & 6 deletions ci/docker/arm-linux-androideabi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
FROM ubuntu:16.04
FROM ubuntu:22.04

RUN dpkg --add-architecture i386 && \
apt-get update && \
RUN apt-get update && \
apt-get install -y --no-install-recommends \
file \
make \
curl \
ca-certificates \
python \
python-is-python3 \
unzip \
expect \
openjdk-9-jre \
libstdc++6:i386 \
openjdk-8-jre \
libstdc++6-i386-cross \
libpulse0 \
gcc \
libc6-dev
Expand Down
4 changes: 2 additions & 2 deletions ci/docker/x86_64-linux-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:16.04
FROM ubuntu:22.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
curl \
gcc \
libc-dev \
python \
python-is-python3 \
unzip \
file \
make
Expand Down
1 change: 0 additions & 1 deletion crates/core_arch/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
f16c_target_feature,
allow_internal_unstable,
decl_macro,
bench_black_box,
asm_const,
target_feature_11
)]
Expand Down
1 change: 0 additions & 1 deletion crates/stdarch-test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//! This basically just disassembles the current executable and then parses the
//! output once globally and then provides the `assert` function which makes
//! assertions about the disassembly of a function.
#![feature(bench_black_box)] // For black_box
#![deny(rust_2018_idioms)]
#![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]

Expand Down