Android OpenSSL support

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "libs/mavlink/include/mavlink/v2.0"]
 	path = libs/mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
+[submodule "libs/OpenSSL/android_openssl"]
+	path = libs/OpenSSL/android_openssl
+	url = https://github.com/Auterion/android_openssl

QGCExternalLibs.pri

@@ -2,7 +2,7 @@
 # [REQUIRED] Add support for <inttypes.h> to Windows.
 #
 WindowsBuild {
-    INCLUDEPATH += libs/lib/msinttypes
+    INCLUDEPATH += libs/msinttypes
 }
 
 #
@@ -106,34 +106,26 @@ SOURCES += \
 #
 MacBuild {
     INCLUDEPATH += \
-        $$BASEDIR/libs/lib/Frameworks/SDL2.framework/Headers
+        $$BASEDIR/libs/Frameworks/SDL2.framework/Headers
     LIBS += \
-        -F$$BASEDIR/libs/lib/Frameworks \
+        -F$$BASEDIR/libs/Frameworks \
         -framework SDL2
 } else:LinuxBuild {
     PKGCONFIG = sdl2
 } else:WindowsBuild {
-    INCLUDEPATH += $$BASEDIR/libs/lib/sdl2/msvc/include
+    INCLUDEPATH += $$BASEDIR/libs/sdl2/msvc/include
     INCLUDEPATH += $$BASEDIR/libs/OpenSSL/Windows/x64/include
-    LIBS += -L$$BASEDIR/libs/lib/sdl2/msvc/lib/x64
+    LIBS += -L$$BASEDIR/libs/sdl2/msvc/lib/x64
     LIBS += -lSDL2
 }
 
-# Include Android OpenSSL libs in order to make Qt OpenSSL support work
-# 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}")
-#    }
-#}
+# Include Android OpenSSL libs
+AndroidBuild {
+    include($$BASEDIR/libs/OpenSSL/android_openssl/openssl.pri)
+    message("ANDROID_EXTRA_LIBS")
+    message($$ANDROID_TARGET_ARCH)
+    message($$ANDROID_EXTRA_LIBS)
+}
 
 # Pairing
 contains(DEFINES, QGC_ENABLE_PAIRING) {

QGCSetup.pri

@@ -48,7 +48,7 @@ MacBuild {
 
 MacBuild {
     # Copy non-standard frameworks into app package
-    QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
+    QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
     # SDL2 Framework
     QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
     # AirMap