[Mesa-dev] [PATCH] i965: android: pass the correct header path to brw_oa.py

Lionel Landwerlin lionel.g.landwerlin at intel.com
Tue Mar 20 22:08:14 UTC 2018


$(intermediates) is somehow different from $(dir $@).

We were also passing the xml files twice :/

Fixes: 2d2b15fbcab ("i965: fix autotools/android build")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105634
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Tested-by: Mark Janes <mark.a.janes at intel.com>
---
 src/mesa/drivers/dri/i965/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 8c4a613bcf3..9880fa53330 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -315,7 +315,7 @@ i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \
 $(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES)
 	@echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
 	@mkdir -p $(dir $@)
-	$(hide) $(MESA_PYTHON2) $< --code=$@ $(i965_oa_xml_FILES) --header=$@ $(i965_oa_xml_FILES)
+	$(hide) $(MESA_PYTHON2) $< --code=$@ --header=$(dir $@)/brw_oa_metrics.h $(i965_oa_xml_FILES)
 
 $(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
 
-- 
2.16.2



More information about the mesa-dev mailing list