From 9cb01cfc420e06238578fdcced6b061c1f33d356 Mon Sep 17 00:00:00 2001
From: Nicolas Capens <capn@google.com>
Date: Fri, 4 Aug 2017 09:36:32 -0400
Subject: [PATCH] Refactor Android includes.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Forward declare ANativeWindow, and remove <hardware/gralloc.h> where
GrallocAndroid.hpp already includes it.

Change-Id: Idebd4c40280960ff00cd51b6633c1c84a8cf7de2
Reviewed-on: https://swiftshader-review.googlesource.com/11288
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
---
 src/Main/FrameBufferAndroid.cpp | 1 +
 src/Main/FrameBufferAndroid.hpp | 4 ++--
 src/OpenGL/common/Image.hpp     | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Main/FrameBufferAndroid.cpp b/src/Main/FrameBufferAndroid.cpp
index 73409216d..49957c86e 100644
--- a/src/Main/FrameBufferAndroid.cpp
+++ b/src/Main/FrameBufferAndroid.cpp
@@ -15,6 +15,7 @@
 #include "FrameBufferAndroid.hpp"
 #include "GrallocAndroid.hpp"
 
+#include <system/window.h>
 #include <cutils/log.h>
 
 namespace sw
diff --git a/src/Main/FrameBufferAndroid.hpp b/src/Main/FrameBufferAndroid.hpp
index 7e34ea274..44001884a 100644
--- a/src/Main/FrameBufferAndroid.hpp
+++ b/src/Main/FrameBufferAndroid.hpp
@@ -18,8 +18,8 @@
 #include "Main/FrameBuffer.hpp"
 #include "Common/Debug.hpp"
 
-#include <hardware/gralloc.h>
-#include <system/window.h>
+struct ANativeWindow;
+struct ANativeWindowBuffer;
 
 namespace sw
 {
diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index c2e7f534c..e13b19ece 100644
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -22,7 +22,6 @@
 #include <GLES2/gl2ext.h>
 
 #if defined(__ANDROID__)
-#include <hardware/gralloc.h>
 #include <system/window.h>
 #include "../../Common/GrallocAndroid.hpp"
 #include "../../Common/DebugAndroid.hpp"
-- 
2.11.0