From d7fbf94ae846e4cffb6ee62257c7aca7871180bf Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 26 Sep 2020 21:17:09 +0200 Subject: [PATCH] android: gallium/radeonsi: cleanup si_driinfo.h gen rules Android.mk and Makefile.sources are still defining si_driinfo.h target This patch removes the remaining gen rules Fixes the following building error: FAILED: out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_pipe_radeonsi_intermediates/radeonsi/si_driinfo.h ... cp: bad 'out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_pipe_radeonsi_intermediates/radeonsi/si_driinfo.h': No such file or directory Fixes: 974981c4e6b9 ("gallium/drm: Make the pipe loader handle the driconf merging.") Signed-off-by: Mauro Rossi Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/Android.mk | 7 ------- src/gallium/drivers/radeonsi/Makefile.sources | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index abe572301a2..1c1106dd85b 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -49,15 +49,8 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeonsi -intermediates := $(call local-generated-sources-dir) - # We need to get NIR's generated headers. LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/radeonsi/,$(GENERATED_SOURCES)) - -LOCAL_C_INCLUDES += $(intermediates)/radeonsi - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) $(call mesa-build-with-llvm) diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources index 0ea232edff5..f9f9cc63eb8 100644 --- a/src/gallium/drivers/radeonsi/Makefile.sources +++ b/src/gallium/drivers/radeonsi/Makefile.sources @@ -1,8 +1,4 @@ -GENERATED_SOURCES := \ - si_driinfo.h - C_SOURCES := \ - $(GENERATED_SOURCES) \ cik_sdma.c \ driinfo_radeonsi.h \ gfx10_query.c \