On 08.02.2017 08:14, Mauro Rossi wrote:
generated-sources-dir-for macro replaces intermediates-dir-for
and LOCAL_MODULE_CLASS is defined as required by new macro,
in order to avoid the following building error:

external/mesa/src/gallium/drivers/radeonsi/si_debug.c:29:10: fatal error: 
'sid_tables.h' file not found
         ^
1 error generated.

Acked-by: Nicolai Hähnle <nicolai.haeh...@amd.com>

---
 src/gallium/drivers/radeonsi/Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/Android.mk 
b/src/gallium/drivers/radeonsi/Android.mk
index d8bc990..d1e323a 100644
--- a/src/gallium/drivers/radeonsi/Android.mk
+++ b/src/gallium/drivers/radeonsi/Android.mk
@@ -32,9 +32,11 @@ LOCAL_SRC_FILES := $(C_SOURCES)

 LOCAL_CFLAGS += -DFORCE_BUILD_AMDGPU   # instructs LLVM to declare 
LLVMInitializeAMDGPU* functions

+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/amd/common \
-       $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_amd_common)/common
+       $(call 
generated-sources-dir-for,STATIC_LIBRARIES,libmesa_amd_common,,)/common

 LOCAL_SHARED_LIBRARIES := libdrm_radeon
 LOCAL_MODULE := libmesa_pipe_radeonsi


_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to