diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-11-28 14:58:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 14:58:55 -0800 |
| commit | d9847fc249a3ba4da8d5eef3fce80fddaf9368b1 (patch) | |
| tree | 5661c1705f35680f33fe124008baff94cf772b27 /Source/Android/jni/MainAndroid.cpp | |
| parent | b793ee6521b7451fc1e9185e46d66c8af9496de5 (diff) | |
| parent | ef32a10d6916785ae514982a9d2962145367bc99 (diff) | |
Merge pull request #8497 from OatmealDome/touchscreen-decoupling
InputCommon: Decouple ButtonManager and Touchscreen from Android
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 2 |
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 { |