From: Mauro Rossi Date: Sat, 22 Feb 2020 15:20:10 +0000 (+0100) Subject: android: r600/sfn: fix includes and libmesa_nir dependency X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=88c68c0ac7618c56ba17755ea6b93827437dd46a android: r600/sfn: fix includes and libmesa_nir dependency Fixes the following building errors: In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.cpp:28: In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.h:34: In file included from external/mesa/src/compiler/nir/nir.h:41: In file included from external/mesa/src/compiler/nir_types.h:36: external/mesa/src/compiler/glsl_types.h:38:10: fatal error: 'main/config.h' file not found #include "main/config.h" ^~~~~~~~~~~~~~~ 1 error generated. In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.cpp:28: In file included from external/mesa/src/gallium/drivers/r600/sfn/sfn_debug.h:34: external/mesa/src/compiler/nir/nir.h:50:10: fatal error: 'nir_opcodes.h' file not found #include "nir_opcodes.h" ^~~~~~~~~~~~~~~ 1 error generated. Fixes: f718ac62 ("r600/sfn: Add a basic nir shader backend") Signed-off-by: Mauro Rossi Reviewed-by: Gert Wollny --- diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 19a3ba8209f..296aa3ac9b9 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -32,8 +32,10 @@ LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) LOCAL_C_INCLUDES += \ $(MESA_TOP)/src/amd/common \ - $(MESA_TOP)/src/amd/llvm + $(MESA_TOP)/src/amd/llvm \ + $(MESA_TOP)/src/mesa +LOCAL_STATIC_LIBRARIES := libmesa_nir LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_r600