On 20.03.2018 23:11, Lionel Landwerlin wrote:
This is the equivalent of commit 5770e1d89e0eb49eb3c9547e8657d636b6e7e5d7 for
android.
Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Fixes: 2d2b15fbcab ("i965: fix autotools/android build")
---
src/mesa/drivers/dri/i965/Android.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/mesa/drivers/dri/i965/Android.mk
b/src/mesa/drivers/dri/i965/Android.mk
index 8c4a613bcf3..ac2f2346ed1 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -315,7 +315,10 @@ 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=$@ $(i965_oa_xml_FILES) \
+ --header=$@ \
There are 2 issues with this, both code and header can't be $@, looks
like that contains the c file path. Another issue is that when defining
i965_oa_xml_fiLES, LOCAL_PATH does not have correct path (it can be
pretty much anything at that point) so xml files won't be found. I'll
try to fix these and send a patch.
+ $(i965_oa_xml_FILES:%=$(srcdir)/%)
$(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
// Tapani
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
