[Mesa-dev] [PATCH] android: amd/common: fix sid_tables.h generation rules

Mauro Rossi issor.oruam at gmail.com
Fri Aug 11 14:02:10 UTC 2017


Current generation rules rely on LOCAL_PATH variable,
which may be undefined when dependencies are expanded;
move to using MESA_TOP variable to define sid_tables.py script path

Fixes the following building error:

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

Fixes: 730574c58e "android: amd/common: add support for libmesa_amd_common"

Cc: "17.1 17.2" <mesa-stable at lists.freedesktop.org>
---
 src/amd/Android.common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index 7d08bfd31d..f4497ed639 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -44,7 +44,7 @@ LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, $(AMD_GENERATED_FILES)
 $(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
 $(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
 
-$(intermediates)/common/sid_tables.h: $(LOCAL_PATH)/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
+$(intermediates)/common/sid_tables.h: $(MESA_TOP)/src/amd/common/sid_tables.py $(MESA_TOP)/src/amd/common/sid.h
 	$(transform-generated-source)
 
 LOCAL_C_INCLUDES := \
-- 
2.11.0



More information about the mesa-dev mailing list