From 9529e488ecad32c91bb33e11b19b0d1a052adaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Fri, 1 Dec 2017 16:02:39 +0100
Subject: [PATCH] Platform: users of the AndroidApplication don't need the
 glue.

Made the include private and added some public headers instead.
---
 modules/FindMagnum.cmake                   | 2 --
 src/Magnum/Platform/AndroidApplication.cpp | 1 +
 src/Magnum/Platform/AndroidApplication.h   | 5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
index 9f7d19a59..ce70def76 100644
--- a/modules/FindMagnum.cmake
+++ b/modules/FindMagnum.cmake
@@ -510,8 +510,6 @@ foreach(_component ${Magnum_FIND_COMPONENTS})
             # Android application dependencies
             if(_component STREQUAL AndroidApplication)
                 find_package(EGL)
-                set_property(TARGET Magnum::${_component} APPEND PROPERTY
-                    INTERFACE_INCLUDE_DIRECTORIES ${ANDROID_NATIVE_APP_GLUE_INCLUDE_DIR})
                 set_property(TARGET Magnum::${_component} APPEND PROPERTY
                     INTERFACE_LINK_LIBRARIES android EGL::EGL)
 
diff --git a/src/Magnum/Platform/AndroidApplication.cpp b/src/Magnum/Platform/AndroidApplication.cpp
index 62d450c78..f0303666a 100644
--- a/src/Magnum/Platform/AndroidApplication.cpp
+++ b/src/Magnum/Platform/AndroidApplication.cpp
@@ -27,6 +27,7 @@
 
 #include <Corrade/Utility/AndroidStreamBuffer.h>
 #include <Corrade/Utility/Debug.h>
+#include <android_native_app_glue.h>
 
 #include "Magnum/Version.h"
 #include "Magnum/Platform/Context.h"
diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h
index 43d861078..06684402e 100644
--- a/src/Magnum/Platform/AndroidApplication.h
+++ b/src/Magnum/Platform/AndroidApplication.h
@@ -31,7 +31,6 @@
 
 #include <memory>
 #include <EGL/egl.h>
-#include <android_native_app_glue.h>
 
 #include "Magnum/Magnum.h"
 #include "Magnum/Tags.h"
@@ -42,9 +41,13 @@
 #error this file is available only on Android build
 #endif
 
+#include <android/input.h>
+
 /* Undef Xlib nonsense which might get pulled in by EGL */
 #undef None
 
+struct android_app;
+
 namespace Magnum { namespace Platform {
 
 /** @nosubgrouping