Browse Source

Include prebuilt android OpenSLL libs

QGC4.4
Don Gagne 6 years ago
parent
commit
057d3e7a7b
  1. 10
      QGCExternalLibs.pri
  2. 2
      android/AndroidManifest.xml
  3. 1
      libs/AndroidOpenSSL/README.md
  4. BIN
      libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a
  5. BIN
      libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so
  6. BIN
      libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a
  7. BIN
      libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so
  8. BIN
      libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a
  9. BIN
      libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so
  10. BIN
      libs/AndroidOpenSSL/arch-x86/lib/libssl.a
  11. BIN
      libs/AndroidOpenSSL/arch-x86/lib/libssl.so

10
QGCExternalLibs.pri

@ -132,6 +132,16 @@ MacBuild { @@ -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
#

2
android/AndroidManifest.xml

@ -68,6 +68,8 @@ @@ -68,6 +68,8 @@
<uses-feature android:name="android.hardware.location.network" android:required="false"/>
<uses-feature android:name="android.hardware.location" android:required="false"/>
<uses-permission android:name="android.permission.INTERNET" />
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
Remove the comment if you do not require these default features. -->
<!-- %%INSERT_FEATURES -->

1
libs/AndroidOpenSSL/README.md

@ -0,0 +1 @@ @@ -0,0 +1 @@
These OpenSLL libraries foir Android are built using the scripts found here: https://github.com/esutton/android-openssl

BIN
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.a

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libcrypto.so

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.a

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-armeabi-v7a/lib/libssl.so

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.a

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-x86/lib/libcrypto.so

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-x86/lib/libssl.a

Binary file not shown.

BIN
libs/AndroidOpenSSL/arch-x86/lib/libssl.so

Binary file not shown.
Loading…
Cancel
Save