diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 656935f..0c9fc13 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 7143aa2..735d27f 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 0000000..3ba978a --- /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 0000000..40c26e6 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 0000000..293c784 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 0000000..f077c80 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 0000000..805a33e 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 0000000..6a8dae4 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 0000000..75525b6 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 0000000..15d038f 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 0000000..17a1d6b Binary files /dev/null and b/libs/AndroidOpenSSL/arch-x86/lib/libssl.so differ