diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 68a9aab8..3dab51fc 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive -ARG SDK_VER=21 +ARG SDK_VER=29 RUN apt-get update && apt-get -y upgrade && \ apt-get -y install \ openjdk-8-jdk \ @@ -20,7 +20,8 @@ RUN apt-get update && apt-get -y upgrade && \ autopoint \ libfreetype6-dev \ sudo \ - wget + wget \ + python3 COPY docker_init.sh / @@ -29,5 +30,5 @@ ENTRYPOINT ["/docker_init.sh"] ADD commandlinetools-linux.tgz /opt/android # Install required Android packages -RUN echo "y" | /opt/android/cmdline-tools/bin/sdkmanager --sdk_root=/opt/android "build-tools;28.0.3" "ndk;21.0.6113669" "platforms;android-$SDK_VER" "cmake;3.10.2.4988404" && /opt/android/cmdline-tools/bin/sdkmanager --sdk_root=/opt/android --uninstall "emulator" +RUN echo "y" | /opt/android/cmdline-tools/bin/sdkmanager --sdk_root=/opt/android "build-tools;29.0.2" "ndk;21.4.7075529" "platforms;android-$SDK_VER" "cmake;3.22.1" && /opt/android/cmdline-tools/bin/sdkmanager --sdk_root=/opt/android --uninstall "emulator" diff --git a/android/docker/start.sh b/android/docker/start.sh index c57404b9..c3328f6a 100755 --- a/android/docker/start.sh +++ b/android/docker/start.sh @@ -12,7 +12,7 @@ IFS= THISDIR=$(readlinkf ${BASH_SOURCE%/*}) BASEDIR=$(readlinkf ${BASH_SOURCE%/*}/../../..) -SDK_VER=21 +SDK_VER=29 COMMAND="" function usage() { diff --git a/android/makelibs.sh b/android/makelibs.sh index 026d2c16..0be832db 100755 --- a/android/makelibs.sh +++ b/android/makelibs.sh @@ -2030,7 +2030,7 @@ return $ERR build_libbluray() { rm -rf build -LIBBLURAYVER=1.1.2 +LIBBLURAYVER=1.3.4 LIBBLURAY=libbluray-$LIBBLURAYVER echo -e "\n**** $LIBBLURAY ****" setup_lib ftp://ftp.videolan.org/pub/videolan/libbluray/$LIBBLURAYVER/$LIBBLURAY.tar.bz2 $LIBBLURAY