freerdp: better matching for old ndk

This is a nonstandard workaround in any case, let's just make it slightly less hardcoded.
(required when using https://gitlab.com/fdroid/fdroidserver/-/merge_requests/762)
This commit is contained in:
Marcus Hoffmann 2020-11-21 22:53:53 +01:00
parent 39b4e05ed8
commit 7dd04e8fb2

View file

@ -120,7 +120,7 @@ Builds:
- pushd ../../../../scripts
- export ANDROID_NDK=$$NDK$$
- export ANDROID_SDK=$$SDK$$
- export ANDROID_NDK_OPENH264=$$NDK$$/../r15c
- export ANDROID_NDK_OPENH264=$$NDK$$/../*r15c
- ./android-build-freerdp.sh --conf android-build-32.conf
- ./android-build-freerdp.sh --conf android-build-64.conf
- popd
@ -129,7 +129,8 @@ Builds:
MaintainerNotes: |-
* Keep OpenH264 at 1.8.0 as the newer versions have issues with reference frames and
the H264 data sent by microsoft RDP servers.
* Can not build OpenH264 since OpenSSL already needs r21 to build.
* OpenH264 need maximum NDK r15c, so we assume that is available on the buildserver
next to the one we are using in the rest of the build
* Need to update NDK target to 21 for tmerfd_create
* The build script argument passing is buggy, provide NDK and SDK via environment too