Skip to content
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

bump linux-image version to fix CI #498

Merged
merged 4 commits into from
Dec 12, 2020
Merged

bump linux-image version to fix CI #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fcf836
bump linux-image version to fix CI
japaric Dec 9, 2020
9312b43
base android images on Ubuntu 20.04
japaric Dec 9, 2020
d85ed8d
actually base ALL android images on Ubuntu 20.04
japaric Dec 9, 2020
39107c0
do not symlink python interpreter; call repo w/ python3
japaric Dec 10, 2020
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
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.arm-linux-androideabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armv7-linux-androideabi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-linux-android
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
1 change: 1 addition & 0 deletions docker/android-ndk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ main() {
pushd "${td}"
curl --retry 3 -sSfL "${NDK_URL}" -O
unzip -q android-ndk-*.zip
rm android-ndk-*.zip
pushd android-ndk-*
./build/tools/make_standalone_toolchain.py \
--install-dir /android-ndk \
Expand Down
37 changes: 19 additions & 18 deletions docker/android-system.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ main() {
g++-multilib
make
python
python3
)

# fake java and javac, it is not necessary for what we build, but the build
Expand Down Expand Up @@ -55,32 +56,32 @@ EOF

# this is the minimum set of modules that are need to build bionic
# this was created by trial and error
./repo init -u https://android.googlesource.com/platform/manifest -b android-5.0.0_r1
./repo sync -c bionic
./repo sync -c build
./repo sync -c external/compiler-rt
./repo sync -c external/jemalloc
./repo sync -c external/libcxx
./repo sync -c external/libcxxabi
./repo sync -c external/libselinux
./repo sync -c external/mksh
./repo sync -c external/openssl
./repo sync -c external/stlport
./repo sync -c prebuilts/clang/linux-x86/host/3.5
./repo sync -c system/core
python3 ./repo init -u https://android.googlesource.com/platform/manifest -b android-5.0.0_r1
python3 ./repo sync -c bionic
python3 ./repo sync -c build
python3 ./repo sync -c external/compiler-rt
python3 ./repo sync -c external/jemalloc
python3 ./repo sync -c external/libcxx
python3 ./repo sync -c external/libcxxabi
python3 ./repo sync -c external/libselinux
python3 ./repo sync -c external/mksh
python3 ./repo sync -c external/openssl
python3 ./repo sync -c external/stlport
python3 ./repo sync -c prebuilts/clang/linux-x86/host/3.5
python3 ./repo sync -c system/core
case "${arch}" in
arm)
./repo sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
python3 ./repo sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
;;
arm64)
./repo sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
./repo sync prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
python3 ./repo sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8
python3 ./repo sync prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
;;
x86)
./repo sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8
python3 ./repo sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8
;;
x86_64)
./repo sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8
python3 ./repo sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8
;;
esac

Expand Down
2 changes: 1 addition & 1 deletion docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
main() {
# arch in the rust target
local arch="${1}" \
kversion=4.19.0-10
kversion=4.19.0-11

local debsource="deb http://http.debian.net/debian/ buster main"
debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"
Expand Down