diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 5dcfbacc6867084c060f34623d227e5ed7834256..9f18fa695f028714d0cc1dd8caa81e54efe8358f 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -120,19 +120,20 @@ MacBuild { } # Include Android OpenSSL libs in order to make Qt OpenSSL support work -AndroidBuild { - equals(ANDROID_TARGET_ARCH, armeabi-v7a) { - ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libcrypto.so - ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libssl.so - } else:equals(ANDROID_TARGET_ARCH, arm64-v8a) { - # Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork. - } else:equals(ANDROID_TARGET_ARCH, x86) { - ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libcrypto.so - ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libssl.so - } else { - error("Unsupported Android architecture: $${ANDROID_TARGET_ARCH}") - } -} +# Temp removal +#AndroidBuild { +# equals(ANDROID_TARGET_ARCH, armeabi-v7a) { +# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libcrypto.so +# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-armeabi-v7a/lib/libssl.so +# } else:equals(ANDROID_TARGET_ARCH, arm64-v8a) { +# # Haven't figured out how to get 64 bit arm OpenSLL yet. This means things like terrain queries will not qork. +# } else:equals(ANDROID_TARGET_ARCH, x86) { +# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libcrypto.so +# ANDROID_EXTRA_LIBS += $$BASEDIR/libs/OpenSSL/Android/arch-x86/lib/libssl.so +# } else { +# error("Unsupported Android architecture: $${ANDROID_TARGET_ARCH}") +# } +#} # Pairing contains(DEFINES, QGC_ENABLE_PAIRING) {