Updates and fixes for build with docker process.

Author: iiordanov

README.md

@@ -51,10 +51,8 @@ Make sure you're running the commands below from the root of the project.
 Ensure ANDROID_SDK is set to the path to your SDK.
 
 ```bash
-export ANDROID_SDK=${HOME}/Android/Sdk
 echo "USER_UID=$(id -u)" > docker/.env
 echo "USER_GID=$(id -g)" >> docker/.env
-echo "ANDROID_SDK=${ANDROID_SDK}" >> docker/.env
 echo "CURRENT_WORKING_DIR=$(pwd)" >> docker/.env
 docker-compose -f docker/docker-compose.yml up
 ```
@@ -64,7 +62,7 @@ docker-compose -f docker/docker-compose.yml up
 Building from scratch and working in Android Studio.
 
   - Install some packages. On Ubuntu:
-        apt install gnome-common gobject-introspection nasm gtk-doc-tools
+        apt install gnome-common gobject-introspection nasm gtk-doc-tools python-is-python3
 
   - On Linux, install Android Studio
   - Install Android SDK from Tools -> SDK Tools
@@ -87,7 +85,7 @@ Building from scratch and working in Android Studio.
 
     - Accept all licenses (repeat if you see an error during build)
 
-              ${ANDROID_SDK}/tools/bin/sdkmanager --licenses
+              ${ANDROID_SDK}/cmdline-tools/bin/sdkmanager --licenses
 
     - Then, run the build script which takes hours to run. E.g.:
 

docker/Dockerfile

@@ -1,37 +1,49 @@
-FROM ubuntu:bionic
+FROM ubuntu:focal
 
 ARG USER_UID
 ARG USER_GID
 ARG CURRENT_WORKING_DIR
-ARG ANDROID_SDK
+ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update && \
-apt install -yy gnome-common gobject-introspection nasm openjdk-8-jdk build-essential git python-setuptools python3-setuptools wget curl unzip sudo rsync && \
-apt clean && apt autoclean
+ENV ANDROID_SDK=/home/remote-clients/android-sdk
 
-# This layer is needed by cerbero to avoid an interactive sudo apt-get failing, needs to be update with subsequent cerbero versions
-RUN sudo apt -yy install autotools-dev automake autoconf libtool g++ autopoint make cmake bison flex yasm pkg-config gtk-doc-tools \
-libxv-dev libx11-dev libpulse-dev python3-dev texinfo gettext build-essential pkg-config doxygen curl libxext-dev libxi-dev \
-x11proto-record-dev libxrender-dev libgl1-mesa-dev libxfixes-dev libxdamage-dev libxcomposite-dev libasound2-dev libxml-simple-perl \
-dpkg-dev debhelper build-essential devscripts fakeroot transfig gperf libdbus-glib-1-dev wget glib-networking libxtst-dev libxrandr-dev \
-libglu1-mesa-dev libegl1-mesa-dev git subversion xutils-dev intltool ccache python3-setuptools python3-pip libssl-dev chrpath libfuse-dev
+# This layer is needed by cerbero to avoid an interactive sudo apt-get failing, needs to be updated with subsequent cerbero versions
+RUN apt update && \
+apt install -yy gnome-common gobject-introspection nasm openjdk-17-jdk build-essential git python-setuptools python3-setuptools wget curl unzip sudo rsync \
+ autotools-dev automake autoconf libtool g++ autopoint make cmake bison flex yasm pkg-config gtk-doc-tools python-is-python3 libx11-xcb-dev \
+ libxv-dev libx11-dev libpulse-dev python3-dev texinfo gettext build-essential pkg-config doxygen curl libxext-dev libxi-dev python3-distro \
+ x11proto-record-dev libxrender-dev libgl1-mesa-dev libxfixes-dev libxdamage-dev libxcomposite-dev libasound2-dev libxml-simple-perl help2man \
+ dpkg-dev debhelper build-essential devscripts fakeroot transfig gperf libdbus-glib-1-dev wget glib-networking libxtst-dev libxrandr-dev \
+ libglu1-mesa-dev libegl1-mesa-dev git subversion xutils-dev intltool ccache python3-setuptools python3-pip libssl-dev chrpath libfuse-dev \
+ libncurses6 libtinfo6 \
+  && apt clean && apt autoclean
+
+RUN ln -sf /usr/lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5
+RUN ln -sf /usr/lib/x86_64-linux-gnu/libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5
 
 # This layer is needed to install spice-gtk dependencies, requires pyparsing
-RUN python3 -m pip install pyparsing==2.4.7
+RUN python3 -m pip install pyparsing==2.4.7 setuptools
 
+RUN mkdir -p $ANDROID_SDK
 
-RUN mkdir -p $ANDROID_SDK $CURRENT_WORKING_DIR
-
-RUN groupadd -g $USER_GID remote-clients
+RUN groupadd -g $USER_GID remote-clients || true
 RUN useradd -u $USER_UID -g $USER_GID -m remote-clients
 RUN git config --global protocol.file.allow always
 
+RUN chown remote-clients -R /home/remote-clients
 RUN echo "remote-clients ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 USER remote-clients
 WORKDIR ${CURRENT_WORKING_DIR}
 RUN git config --global protocol.file.allow always
 
-CMD export PROJECT=libs && export ANDROID_SDK=$ANDROID_SDK && export PATH=$PATH:$ANDROID_SDK/platform-tools/ && export PATH=$PATH:$ANDROID_SDK/tools && \
-yes | $ANDROID_SDK/tools/bin/sdkmanager --licenses && \
-./bVNC/prepare_project.sh libs $ANDROID_SDK
+RUN cd ${HOME} && curl -o ${HOME}/commandlinetools-linux.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip && \
+ unzip ${HOME}/commandlinetools-linux.zip && cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_SDK "platforms;android-34"
+
+CMD export PROJECT=libs && \
+ export ANDROID_SDK=$ANDROID_SDK && \
+ export PATH=$PATH:$ANDROID_SDK/platform-tools/ && \
+ export PATH=$PATH:$ANDROID_SDK/tools && \
+ export PATH=$PATH:$ANDROID_SDK/cmdline-tools/bin && \
+ yes | $HOME/cmdline-tools/bin/sdkmanager --sdk_root=$ANDROID_SDK --licenses && \
+ ./bVNC/prepare_project.sh libs $ANDROID_SDK

docker/docker-compose.yml

@@ -9,8 +9,6 @@ services:
       args:
         - USER_UID
         - USER_GID
-        - ANDROID_SDK
         - CURRENT_WORKING_DIR
     volumes:
-      - ${ANDROID_SDK}:${ANDROID_SDK}:cached
       - ${CURRENT_WORKING_DIR}:${CURRENT_WORKING_DIR}:cached

remoteClientLib/jni/libs/build-deps.conf

@@ -27,7 +27,7 @@ nettle_ver="3.4.1"
 # Tarball URLs
 configguess_url="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=${configguess_ver}"
 configsub_url="http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;h=${configsub_ver}"
-openssl_url="http://www.openssl.org/source/openssl-${openssl_ver}.tar.gz"
+openssl_url="https://github.com/openssl/openssl/releases/download/OpenSSL_$(echo $openssl_ver | sed 's/\./_/g')/openssl-${openssl_ver}.tar.gz"
 spicegtk_url="http://www.spice-space.org/download/gtk/spice-gtk-${spicegtk_ver}.tar.bz2"
 spiceprotocol_url="http://www.spice-space.org/download/releases/spice-protocol-${spiceprotocol_ver}.tar.bz2"
 gstreamer_armeabi_url="http://gstreamer.freedesktop.org/data/pkg/android/${gstreamer_ver}/gstreamer-1.0-android-universal-${gstreamer_ver}.tar.xz"

remoteClientLib/jni/libs/build-deps.sh

@@ -483,12 +483,14 @@ build() {
         popd
         rsync -avP recipes/ cerbero/recipes/
 
-        sed -i "s/version = '1.1.1.*'/version = '${openssl_ver}'/" cerbero/recipes/openssl.recipe
+        sed -i "s/version = '.*'/version = '${openssl_ver}'/" cerbero/recipes/openssl.recipe
+        sed -i "s/ftp.openssl.org\/source/github.com\/openssl\/openssl\/releases\/download\/OpenSSL_$(echo ${openssl_ver} | sed 's/\./_/g')/" cerbero/recipes/openssl.recipe
         sed -i "s/0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1/cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8/" cerbero/recipes/openssl.recipe
 
         echo "Running cerbero build for $1 in $(pwd)"
         cerbero/cerbero-uninstalled -c cerbero/config/cross-android-universal.cbc build \
-          gstreamer-1.0 glib glib-networking libxml2 pixman libsoup openssl cairo json-glib gst-android-1.0 gst-plugins-bad-1.0 gst-plugins-good-1.0 gst-plugins-base-1.0 gst-plugins-ugly-1.0 gst-libav-1.0 spiceglue
+          libjpeg-turbo pyparsing tiff gstreamer-1.0 glib glib-networking libxml2 pixman libsoup openssl \
+          cairo json-glib gst-android-1.0 gst-plugins-bad-1.0 gst-plugins-good-1.0 gst-plugins-base-1.0 gst-plugins-ugly-1.0 gst-libav-1.0 spiceglue
 
         echo "Copying spice-gtk header files that it does not install automatically"
         SPICEDIR=$(ls -d1 cerbero/build/sources/android_universal/${gstarch}/spice-gtk-* | tail -n 1)
@@ -633,9 +635,13 @@ build_freerdp() {
         export OPENH264_NDK=$(install_ndk ../../ ${freerdp_openh264_ndk_version})
         echo "Android NDK version for FreeRDP ${ndk_version} is installed at ${ANDROID_NDK}"
         echo "Installing cmake ${freerdp_cmake_version} for FreeRDP build compatibility"
-        export CMAKE_PATH=$(install_cmake ../../ ${freerdp_cmake_version})/bin
+        export CMAKE_DIR=$(install_cmake ../../ ${freerdp_cmake_version})
+        export CMAKE_PATH=${CMAKE_DIR}/bin
         export PATH=${CMAKE_PATH}:${PATH}
         export CMAKE_PROGRAM=${CMAKE_PATH}/cmake
+
+        rm -rf "${ANDROID_SDK}"/cmake
+        cp -a "${CMAKE_DIR}" "${ANDROID_SDK}"/cmake
         ./scripts/android-build-freerdp.sh
 
         # Prepare the FreeRDPCore project for use as a library