[WIP] cmake build for android

CMakeLists.txt

@@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
 set(PROJECT AmneziaVPN)
 project(${PROJECT})
 
+#if(ANDROID)
+#    set(QT_ANDROID_BUILD_ALL_ABIS ON)
+#endif()
+
 add_subdirectory(client)
 
 if(NOT IOS AND NOT ANDROID)

client/3rd/QtSsh/src/botan/botan.cmake

@@ -38,11 +38,15 @@ if(ANDROID)
     # We need to include qtprivate api's
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
-    set(ANDROID_ABIS ANDROID_TARGET_ARCH)
 
-    link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH})
-    set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH}/botan_all.h)
-    set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${ANDROID_TARGET_ARCH}/botan_all.cpp)
+    message("botan target arch ${CMAKE_ANDROID_ARCH_ABI}")
+    set(abi ${CMAKE_ANDROID_ARCH_ABI})
+
+    include_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
+    link_directories(${CMAKE_CURRENT_LIST_DIR}/android/${abi})
+    set(HEADERS ${HEADERS} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.h)
+    set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/android/${abi}/botan_all.cpp)
+
 endif()
 
 if(IOS)

client/CMakeLists.txt

@@ -268,7 +268,7 @@ if(ANDROID)
     # We need to include qtprivate api's
     # As QAndroidBinder is not yet implemented with a public api
     set(LIBS ${LIBS} Qt6::CorePrivate)
-    set(ANDROID_ABIS ANDROID_TARGET_ARCH)
+    # set(ANDROID_ABIS ANDROID_TARGET_ARCH)
 
     add_compile_definitions(MVPN_ANDROID)
 
@@ -283,7 +283,7 @@ if(ANDROID)
     )
 
     set(SOURCES ${SOURCES}
-        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.cp
+        ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_controller.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/android_notificationhandler.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidutils.cpp
         ${CMAKE_CURRENT_LIST_DIR}/platforms/android/androidvpnactivity.cpp
@@ -469,8 +469,6 @@ set_source_files_properties(
 endif()
 
 if(ANDROID)
-    set(QT_ANDROID_BUILD_ALL_ABIS ON)
-
     add_custom_command(
         TARGET ${PROJECT} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy

client/ui/pages_logic/QrDecoderLogic.cpp

@@ -3,10 +3,6 @@
 #include "ui/uilogic.h"
 #include "ui/pages_logic/StartPageLogic.h"
 
-#if defined(Q_OS_ANDROID)
-#include "android_controller.h"
-#endif
-
 using namespace amnezia;
 using namespace PageEnumNS;
 

client/ui/pages_logic/ServerSettingsLogic.cpp

@@ -2,7 +2,6 @@
 #include "vpnconnection.h"
 
 #include "../uilogic.h"
-#include "ServerListLogic.h"
 #include "ShareConnectionLogic.h"
 #include "VpnLogic.h"
 
@@ -11,7 +10,7 @@
 #include <QTimer>
 
 #if defined(Q_OS_ANDROID)
-#include "androidutils.h"
+#include "../../platforms/android/androidutils.h"
 #endif
 
 ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):

client/ui/pages_logic/StartPageLogic.cpp

@@ -12,7 +12,7 @@
 
 #ifdef Q_OS_ANDROID
 #include <QJniObject>
-#include "androidutils.h"
+#include "../../platforms/android/androidutils.h"
 #endif
 
 StartPageLogic::StartPageLogic(UiLogic *logic, QObject *parent):

client/vpnconnection.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #ifdef Q_OS_ANDROID
-#include "android_controller.h"
+#include "../../platforms/android/android_controller.h"
 #include "protocols/android_vpnprotocol.h"
 #endif