[WIP] cmake build for android

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):