diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0c433c77..6138791ce 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,9 +15,10 @@ if (ENABLE_QT)
     add_subdirectory(citra_qt)
 endif()
 if (ANDROID)
-    add_subdirectory(android/app)
+    add_subdirectory(android/app/src/main/cpp)
+else()
+    add_subdirectory(dedicated_room)
 endif()
 if (ENABLE_WEB_SERVICE)
     add_subdirectory(web_service)
 endif()
-add_subdirectory(dedicated_room)
diff --git a/src/android/app/CMakeLists.txt b/src/android/app/src/main/cpp/CMakeLists.txt
similarity index 85%
rename from src/android/app/CMakeLists.txt
rename to src/android/app/src/main/cpp/CMakeLists.txt
index 6626c6f76..dbc2a2290 100644
--- a/src/android/app/CMakeLists.txt
+++ b/src/android/app/src/main/cpp/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 
 add_library(citra-android STATIC
-            src/main/cpp/dummy.cpp
+            dummy.cpp
             )
 
 # find Android's log library