From 0ff8ac1b55dcc489e73ba6cfaa1ab872b4b9eb0b Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 13 Mar 2017 00:01:21 +0100 Subject: [PATCH] android: i965: generate code for OA counter queries MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Automake generation rules are replicated for android. $* macro was expected to return "hsw" but instead gives "hsw.{h,c}" so $(basename $*) is used as a workaround to set the correct --chipset option for brw_oa.py script. Build tested with nougat-x86 Fixes: e565505 "i965: Add script to gen code for OA counter queries" Reviewed-by: Tapani Pälli Acked-by: Robert Bragg Acked-by: Emil Velikov --- src/mesa/drivers/dri/i965/Android.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index abe8f20a8a1..ac0a4446b95 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -190,5 +190,22 @@ LOCAL_GENERATED_SOURCES := \ $(MESA_DRI_OPTIONS_H) \ $(MESA_GEN_NIR_H) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES + +intermediates := $(call local-generated-sources-dir) + +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ + $(i965_oa_GENERATED_FILES)) + +$(intermediates)/brw_oa_%.h: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py + @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(word 2, $^) --header=$@ --chipset=$(basename $*) $< + +$(intermediates)/brw_oa_%.c: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py + @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(word 2, $^) --code=$@ --chipset=$(basename $*) $< + include $(MESA_COMMON_MK) include $(BUILD_SHARED_LIBRARY) -- 2.30.2