OSDN Git Service

Android: add missing u_math.h include path for libmesa_isl
authorRob Herring <robh@kernel.org>
Mon, 13 Jun 2016 18:45:53 +0000 (13:45 -0500)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 27 Jul 2016 13:06:27 +0000 (14:06 +0100)
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@kernel.org>
Reviewed-by: Kenneth Garunke <kenneth@whitecape.org>
Nominated-by: Emil Velikov <emil.velikov@collabora.com>
(cherry picked from commit 789ed13284cb99b96f2aa69f237959b27c5c3bc2)

src/intel/isl/Android.mk

index ff0c8c9..c828c5c 100644 (file)
@@ -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 \