android: intel/perf: fix missing include path in makefile

Submitted by Mauro Rossi on Aug. 9, 2019, 12:06 p.m.

Details

Message ID 20190809120648.534-1-issor.oruam@gmail.com
State New
Headers show
Series "android: intel/perf: fix missing include path in makefile" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi Aug. 9, 2019, 12:06 p.m.
Fixes the following building error:

In file included from external/mesa/src/intel/perf/gen_perf.c:42:
external/mesa/src/util/u_math.h:42:10:
fatal error: 'pipe/p_compiler.h' file not found
         ^~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: 018f9b8 ("intel/perf: refactor gen_perf_begin_query into gen_perf")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
---
 src/intel/Android.perf.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/intel/Android.perf.mk b/src/intel/Android.perf.mk
index 0d7d746a63..c99d84c4be 100644
--- a/src/intel/Android.perf.mk
+++ b/src/intel/Android.perf.mk
@@ -31,7 +31,9 @@  LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir)
 
-LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/include/drm-uapi \
+	$(MESA_TOP)/src/gallium/include
 
 LOCAL_SRC_FILES := $(GEN_PERF_FILES)
 

Comments

Hey Mauro,

I was kind of surprised that u_math.h would pull a gallium header file.
So I pulled the thread a bit and came up with this MR : 
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/1625

Sorry it's all over the place :(

-Lionel

On 09/08/2019 15:06, Mauro Rossi wrote:
> Fixes the following building error:
>
> In file included from external/mesa/src/intel/perf/gen_perf.c:42:
> external/mesa/src/util/u_math.h:42:10:
> fatal error: 'pipe/p_compiler.h' file not found
>           ^~~~~~~~~~~~~~~~~~~
> 1 error generated.
>
> Fixes: 018f9b8 ("intel/perf: refactor gen_perf_begin_query into gen_perf")
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> ---
>   src/intel/Android.perf.mk | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/intel/Android.perf.mk b/src/intel/Android.perf.mk
> index 0d7d746a63..c99d84c4be 100644
> --- a/src/intel/Android.perf.mk
> +++ b/src/intel/Android.perf.mk
> @@ -31,7 +31,9 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>   
>   intermediates := $(call local-generated-sources-dir)
>   
> -LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi
> +LOCAL_C_INCLUDES := \
> +	$(MESA_TOP)/include/drm-uapi \
> +	$(MESA_TOP)/src/gallium/include
>   
>   LOCAL_SRC_FILES := $(GEN_PERF_FILES)
>