Mesa (master): Android: add missing u_math.h include path for libmesa_isl

Mark Janes majanes at kemper.freedesktop.org
Tue Jun 28 20:03:27 UTC 2016


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

Author: Rob Herring <robh at kernel.org>
Date:   Mon Jun 13 13:45:53 2016 -0500

Android: add missing u_math.h include path for libmesa_isl

Commit 87d062a94080 ("i965: Fix shared local memory size for Gen9+.")
added u_math.h include which broke the Android build:

In file included from external/mesa3d/src/intel/isl/isl_storage_image.c:25:
In file included from external/mesa3d/src/mesa/drivers/dri/i965/brw_compiler.h:29:
external/mesa3d/src/mesa/main/macros.h:35:10: fatal error: 'util/u_math.h' file not found
         ^

Add the missing include paths for libmesa_isl.

Signed-off-by: Rob Herring <robh at kernel.org>
Reviewed-by: Kenneth Garunke <kenneth at whitecape.org>

---

 src/intel/isl/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk
index ff0c8c9..c828c5c 100644
--- a/src/intel/isl/Android.mk
+++ b/src/intel/isl/Android.mk
@@ -116,6 +116,8 @@ LOCAL_MODULE := libmesa_isl
 LOCAL_SRC_FILES := $(ISL_FILES)
 
 LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/mesa \
 	$(MESA_TOP)/src/mesa/drivers/dri/i965 \




More information about the mesa-commit mailing list