From 3764fde97e1d5e48ec2154510312e2f3ec50aac8 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 28 Jun 2022 12:23:04 +0200 Subject: [PATCH] We don't need jdk anymore to build on android --- .github/ci_images/bionic_builder.dockerfile | 2 +- kiwixbuild/packages.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ci_images/bionic_builder.dockerfile b/.github/ci_images/bionic_builder.dockerfile index 89291eb..cefdf30 100644 --- a/.github/ci_images/bionic_builder.dockerfile +++ b/.github/ci_images/bionic_builder.dockerfile @@ -16,7 +16,7 @@ RUN apt update -q \ # Python (2) is needed to install android-ndk python \ # 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 \ # Qt packages qt515base qt515webengine qt515svg qt515imageformats qt515wayland \ diff --git a/kiwixbuild/packages.py b/kiwixbuild/packages.py index 162cdbf..5a229f3 100644 --- a/kiwixbuild/packages.py +++ b/kiwixbuild/packages.py @@ -61,7 +61,7 @@ PACKAGE_NAME_MAPPERS = { 'COMMON': _fedora_common }, 'fedora_android': { - 'COMMON': _fedora_common + ['java-1.8.0-openjdk-devel'] + 'COMMON': _fedora_common }, 'debian_native_dyn': { 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'], @@ -94,7 +94,7 @@ PACKAGE_NAME_MAPPERS = { 'COMMON': _debian_common, }, 'debian_android': { - 'COMMON': _debian_common + ['default-jdk'], + 'COMMON': _debian_common, }, 'Darwin_native_dyn': { 'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'],