Fix Android build script (#5471)

opengisch · Jul 24, 2024 · 3d003fc · 3d003fc · qfield-fairy · Jul 24, 2024
1 parent 0c99973
commit 3d003fc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.docker/android_dev/Dockerfile b/.docker/android_dev/Dockerfile
@@ -9,10 +9,10 @@ ENV APT_PACKAGES="git curl zip unzip tar"
 ## Common build prereqs
 ENV APT_PACKAGES="$APT_PACKAGES g++ vim pkg-config cmake ninja-build ca-certificates"
 
-ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin gettext automake autoconf-archive"
+ENV APT_PACKAGES="$APT_PACKAGES autoconf nasm bison python2 flex build-essential libtool libtool-bin gettext automake autoconf-archive libltdl-dev"
 
 ## Python related
-ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-venv"
+ENV APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-pip python3-jinja2 python3-venv"
 
 ## freeglut
 ENV APT_PACKAGES="$APT_PACKAGES libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev"

diff --git a/scripts/build-vcpkg.sh b/scripts/build-vcpkg.sh
@@ -28,6 +28,7 @@ cmake -S "${SOURCE_DIR}" \
 	-D APP_PACKAGE_NAME="${APP_PACKAGE_NAME}" \
 	-D APP_ICON="${APP_ICON}" \
 	-D APP_NAME="${APP_NAME}" \
+	-D VCPKG_INSTALL_OPTIONS="--allow-unsupported" \
 	${NUGET_TOKEN:+-D NUGET_TOKEN=${NUGET_TOKEN}} \
 	${NUGET_USERNAME:+-D NUGET_USERNAME=${NUGET_USERNAME}}