diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 656935fd5e3de5d6fe0d8eb7c428fdd178cded0c..0c9fc138827a5d1a33f70fa9b519c68ace018bd3 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -132,6 +132,16 @@ MacBuild { -lSDL2 } +AndroidBuild { + contains(QT_ARCH, arm) { + ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so + ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so + } else { + ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so + ANDROID_EXTRA_LIBS += $$BASEDIR/libs/AndroidOpenSSL/arch-x86/lib/libssl.so + } +} + # # [OPTIONAL] Zeroconf for UDP links # diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 7143aa2a4970df8292496c271219ff246bef8988..735d27fc0975e8bdc5452f88e9052d0be20b3e90 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -68,6 +68,8 @@ + + diff --git a/libs/AndroidOpenSSL/README.md b/libs/AndroidOpenSSL/README.md new file mode 100644 index 0000000000000000000000000000000000000000..3ba978a556b2f9d72aed99cda64f455a0f218d80 --- /dev/null +++ b/libs/AndroidOpenSSL/README.md @@ -0,0 +1 @@ +These OpenSLL libraries foir Android are built using the scripts found here: https://github.com/esutton/android-openssl \ No newline at end of file diff --git a/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a new file mode 100644 index 0000000000000000000000000000000000000000..40c26e62fee2e255809fe7f31913b9c2485ee0de Binary files /dev/null and b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a differ diff --git a/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so new file mode 100755 index 0000000000000000000000000000000000000000..293c784ebeaff80890ce95bc1e826506165a2d61 Binary files /dev/null and b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so differ diff --git a/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a new file mode 100644 index 0000000000000000000000000000000000000000..f077c80d04df19f7879b84a55f8db0783045d724 Binary files /dev/null and b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a differ diff --git a/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so new file mode 100755 index 0000000000000000000000000000000000000000..805a33e63dbb3b093b18df02c9ba7995da9c2b74 Binary files /dev/null and b/libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so differ diff --git a/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a b/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a new file mode 100644 index 0000000000000000000000000000000000000000..6a8dae43c4453b9bf8d7c4d7b2e73f9c5050563c Binary files /dev/null and b/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a differ diff --git a/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so b/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so new file mode 100755 index 0000000000000000000000000000000000000000..75525b60c05e870135bc706face52a3698305dc3 Binary files /dev/null and b/libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so differ diff --git a/libs/AndroidOpenSSL/arch-x86/lib/libssl.a b/libs/AndroidOpenSSL/arch-x86/lib/libssl.a new file mode 100644 index 0000000000000000000000000000000000000000..15d038f70cf06767f7efb3e3960ad35ac497c44a Binary files /dev/null and b/libs/AndroidOpenSSL/arch-x86/lib/libssl.a differ diff --git a/libs/AndroidOpenSSL/arch-x86/lib/libssl.so b/libs/AndroidOpenSSL/arch-x86/lib/libssl.so new file mode 100755 index 0000000000000000000000000000000000000000..17a1d6bda8ad6e3354f55f897bb2d380a3da0512 Binary files /dev/null and b/libs/AndroidOpenSSL/arch-x86/lib/libssl.so differ