Base Android build on Ubuntu 24

BearWare · Dec 19, 2024 · 69106e6 · 69106e6
1 parent 0e1a7c4
commit 69106e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/Build/Docker/Dockerfile_android b/Build/Docker/Dockerfile_android
@@ -1,9 +1,10 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
-LABEL Description="TeamTalk for Android in Ubuntu 22.04"
+LABEL Description="TeamTalk for Android in Ubuntu 24.04"
 
 RUN apt update --fix-missing
-# Duplicate of /TeamTalk5/Build/Makefile:depend-ubuntu22-android
+RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata keyboard-configuration
+# Duplicate of /TeamTalk5/Build/Makefile:depend-ubuntu24-android
 RUN apt install -y \
                    autoconf \
                    cmake \
@@ -14,14 +15,14 @@ RUN apt install -y \
                    libtool \
                    make \
                    ninja-build \
-                   openjdk-18-jdk \
+                   openjdk-21-jdk \
                    p7zip-full \
                    pkg-config \
-                   python2 \
-                   python3-pytest \
-                   unzip
+                   unzip \
+                   wget \
+                   xz-utils
 
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 12
 RUN mkdir /root/tt5dist
 RUN curl https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip -o /root/tt5dist/android-ndk.zip
 RUN cd /root/tt5dist && unzip android-ndk.zip
diff --git a/Build/Makefile b/Build/Makefile
@@ -297,30 +297,21 @@ depend-ubuntu24:
 	@echo "Ensure a default python is set up for WebRTC to compile:"
 	@echo "# sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 12"
 
-depend-ubuntu18-android:
+depend-ubuntu24-android:
 	apt install \
 		autoconf \
 		cmake \
+		curl \
 		doxygen \
 		junit4 \
 		libtool \
 		ninja-build \
-		openjdk-11-jdk \
-		pkg-config \
-		python
-
-depend-ubuntu22-android:
-	apt install \
-		autoconf \
-		cmake \
-		doxygen \
-		junit4 \
-		libtool \
-		ninja-build \
-		openjdk-18-jdk \
+		openjdk-21-jdk \
+		p7zip-full \
 		pkg-config \
-		python2 \
-		python3-pytest
+		unzip \
+		wget \
+		xz-utils
 
 depend-debian12:
 	apt install \