diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index bc381d19b6d88cba8484b4a4c0bc3eb7511c4a98..0321d418c22844b7ca6d16ce7615833250cc9e65 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -1,3 +1,4 @@
 
 add_subdirectory(qwt)
+add_subdirectory(qtandroidserialport)
 
diff --git a/libs/qtandroidserialport/CMakeLists.txt b/libs/qtandroidserialport/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..edf1361a144e82093e74a2316bfe3711db3acc66
--- /dev/null
+++ b/libs/qtandroidserialport/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+if (ANDROID)
+	add_library(qtandroidserialport
+		src/qserialport.cpp
+		src/qserialport_android.cpp
+		src/qserialportinfo.cpp
+		src/qserialportinfo_android.cpp
+	)
+
+	target_link_libraries(qtandroidserialport
+	)
+
+	target_include_directories(qtandroidserialport INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1ca9ddfd313853802c7420615f0ccd2e798ad58c..7550244463f90cbc6e7682efdc2437c512eefc02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
 
-
 include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
@@ -13,17 +12,6 @@ if(MOBILE)
 	list(APPEND EXTRA_SRC
 		MobileScreenMgr.cc
 	)
-
-	if (ANDROID)
-		list(APPEND EXTRA_SRC
-			libs/qtandroidserialport/src/qserialport.cpp
-			libs/qtandroidserialport/src/qserialport_android.cpp
-			libs/qtandroidserialport/src/qserialportinfo.cpp
-			libs/qtandroidserialport/src/qserialportinfo_android.cpp
-
-			Joystick/JoystickAndroid.cc
-		)
-	endif()
 endif()
 
 if(BUILD_TESTING)
@@ -74,9 +62,6 @@ if(BUILD_TESTING)
 	add_qgc_test(TCPLinkTest)
 	add_qgc_test(TransectStyleComplexItemTest)
 
-endif()
-
-if(BUILD_TESTING)
 	list(APPEND QGC_RESOURCES
 		UnitTest.qrc
 	)
@@ -85,7 +70,6 @@ endif()
 add_library(qgc
 
 	${QGC_RESOURCES}
-	${QGC_UI}
 
 	${EXTRA_SRC}
 
diff --git a/src/Joystick/CMakeLists.txt b/src/Joystick/CMakeLists.txt
index 7222e5cd91588bf48fc4931281b12f0826261e67..760926640d59e84bebf56cbc3872c621576c85fd 100644
--- a/src/Joystick/CMakeLists.txt
+++ b/src/Joystick/CMakeLists.txt
@@ -1,8 +1,17 @@
 
+set(EXTRA_SRC)
+
+if (ANDROID)
+	list(APPEND EXTRA_SRC
+		JoystickAndroid.cc
+	)
+endif()
+
 add_library(Joystick
 	Joystick.cc
 	JoystickManager.cc
 	JoystickSDL.cc
+	${EXTRA_SRC}
 )
 
 target_link_libraries(Joystick