Merge branch 'master' into 'master'

BuildFix build libs on server (2)

See merge request fdroid/fdroiddata!7520

metadata/la.daube.photochiotte.yml

@@ -27,11 +27,23 @@ Builds:
 
   - versionName: '1.10'
     versionCode: 11
-    disable: fails to build
     commit: v1.10
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y g++
+      - apt-get install -y -t testing nasm
+      - pip3 install wheel==0.35.1
+      - pip3 install ninja==1.10.0
+      - pip3 install meson==0.56.0
     gradle:
       - flavorA
+    build:
+      - cd ..
+      - bash dlbuild.sh all
+      - cd app/src/main/cpp
+      - cmake -DANDROID_NATIVE_API_LEVEL=21 -DCMAKE_TOOLCHAIN_FILE=$$NDK$$/build/cmake/android.toolchain.cmake
+        .
     ndk: r21d
 
 AutoUpdateMode: Version v%v