Mesa (master): gallium: Android build fixes

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3b2ad8b290215a4bd52be4e397c9ab5603b8b372
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b2ad8b290215a4bd52be4e397c9ab5603b8b372

Author: Kristian H. Kristensen <hoegsberg at chromium.org>
Date:   Tue Dec  4 10:19:13 2018 -0800

gallium: Android build fixes

A couple of simple fixes for building on Android with autotools.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/gallium/auxiliary/util/u_debug_stack_android.cpp | 2 +-
 src/gallium/drivers/freedreno/Makefile.am            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/util/u_debug_stack_android.cpp b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
index 395a1fe911..879b0fb2e9 100644
--- a/src/gallium/auxiliary/util/u_debug_stack_android.cpp
+++ b/src/gallium/auxiliary/util/u_debug_stack_android.cpp
@@ -23,7 +23,7 @@
 
 #include <backtrace/Backtrace.h>
 
-#include "u_debug.h"
+#include "util/u_debug.h"
 #include "u_debug_stack.h"
 #include "util/hash_table.h"
 #include "os/os_thread.h"
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 32130ab94c..504ad290de 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -7,6 +7,7 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/freedreno \
 	-I$(top_builddir)/src/compiler/nir \
 	-I$(top_srcdir)/src/compiler/nir \
+	$(LIBDRM_CFLAGS) \
 	$(GALLIUM_DRIVER_CFLAGS)
 
 noinst_LTLIBRARIES = libfreedreno.la