Merge pull request #8165 from DonLakeFlyer/Android32Bit

Remove Android OpenSSL for now

Merge pull request #8165 from DonLakeFlyer/Android32Bit
Remove Android OpenSSL for now
8399b941 · Don Gagne · GitHub · fa5cd027 · 51e836b9 · 8399b941
Unverified Commit 8399b941 authored Dec 23, 2019 by Don Gagne Committed by GitHub Dec 23, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 13 deletions

QGCExternalLibs.pri QGCExternalLibs.pri +14 -13

No files found.
--- 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) {