From: Dylan Baker <dylan@pnwbakers.com>
Date: Mon, 20 Nov 2017 22:54:30 +0000 (-0800)
Subject: glapi: Don't search through subdirs from glapitable.h
X-Git-Tag: android-x86-8.1-r1~5818
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=002fbde71eb411521bdceb6dde772c6e21df0f1e;p=android-x86%2Fexternal-mesa.git

glapi: Don't search through subdirs from glapitable.h

Because meson won't put it in that folder.

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index 30f523ca5fb..6230f1273f3 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -25,7 +25,7 @@
 #include "main/glheader.h"
 
 #include "glapi/glapi.h"
-#include "glapi/glapitable.h"
+#include "glapitable.h"
 
 struct name_offset {
    const char *name;
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index a8395d925bd..94266a1d4ab 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtest/include \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mapi \
+	-I$(top_builddir)/src/mapi/glapi \
+	-I$(top_srcdir)/src/mapi/glapi \
 	-I$(top_builddir)/src/mesa \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/include \