summaryrefslogtreecommitdiff
path: root/Source/Android/jni/MainAndroid.cpp
diff options
context:
space:
mode:
authorOatmealDome <julian@oatmealdome.me>2019-11-27 01:34:01 -0500
committerOatmealDome <julian@oatmealdome.me>2019-11-28 15:20:51 -0500
commitef32a10d6916785ae514982a9d2962145367bc99 (patch)
tree00bae9ff1b1027d65b30d3ad6591049014b14688 /Source/Android/jni/MainAndroid.cpp
parentc2c8a14966dcea8d86a5ea5bb2eeb0f694002425 (diff)
InputCommon: Decouple ButtonManager and Touchscreen from Android
Changes were also made for codestyle compliance.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
-rw-r--r--Source/Android/jni/MainAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index d998097fee..2b8b91de74 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -48,6 +48,7 @@
#include "DiscIO/Volume.h"
#include "InputCommon/ControllerInterface/Android/Android.h"
+#include "InputCommon/ControllerInterface/Touch/ButtonManager.h"
#include "UICommon/UICommon.h"
@@ -58,7 +59,6 @@
#include "../../Core/Common/WindowSystemInfo.h"
#include "jni/AndroidCommon/AndroidCommon.h"
#include "jni/AndroidCommon/IDCache.h"
-#include "jni/ButtonManager.h"
namespace
{