From 51e836b9bfa4eb7abfb0c08a6a332ec4919ccd46 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 23 Dec 2019 09:18:30 -0800 Subject: [PATCH] Remove Android OpenSSL for now --- QGCExternalLibs.pri | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 5dcfbac..9f18fa6 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) {