smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

We don't need jdk anymore to build on android

This commit is contained in:
Matthieu Gautier 2022-06-28 12:23:04 +02:00
parent 5939865e7c
commit 3764fde97e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ci_images/bionic_builder.dockerfile vendored
View File

@ -16,7 +16,7 @@ RUN apt update -q \
# Python (2) is needed to install android-ndk # Python (2) is needed to install android-ndk
python \ python \
# Packaged dependencies # Packaged dependencies
libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \ libbz2-dev libmagic-dev uuid-dev zlib1g-dev \
libmicrohttpd-dev aria2 libgtest-dev libgl-dev \ libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
# Qt packages # Qt packages
qt515base qt515webengine qt515svg qt515imageformats qt515wayland \ qt515base qt515webengine qt515svg qt515imageformats qt515wayland \

4
kiwixbuild/packages.py
View File

@ -61,7 +61,7 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _fedora_common 'COMMON': _fedora_common
}, },
'fedora_android': { 'fedora_android': {
'COMMON': _fedora_common + ['java-1.8.0-openjdk-devel'] 'COMMON': _fedora_common
}, },
'debian_native_dyn': { 'debian_native_dyn': {
'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'], 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'],
@ -94,7 +94,7 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _debian_common, 'COMMON': _debian_common,
}, },
'debian_android': { 'debian_android': {
'COMMON': _debian_common + ['default-jdk'], 'COMMON': _debian_common,
}, },
'Darwin_native_dyn': { 'Darwin_native_dyn': {
'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'], 'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'],