mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-03 21:47:45 +08:00
coin, macOS, FFmpeg: Fix install-ffmpeg-android.sh
Script would previously unconditionally run ln even if target file
sometimes exists in precompiled OpenSSL library.
Change-Id: I90c4ad7c6cbf9207c2c82114936b478a9ba4ae54
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 758ac7896f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
6b453e2221
commit
225eca6109
@@ -57,8 +57,8 @@ build_ffmpeg_android() {
|
||||
libs_prefix="_arm64-v8a"
|
||||
fi
|
||||
|
||||
ln -s "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so"
|
||||
ln -s "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so"
|
||||
ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so"
|
||||
ln -Ffs "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so"
|
||||
|
||||
api_version=24
|
||||
|
||||
|
||||
Reference in New Issue
Block a user