diff options
| author | Lionel Landwerlin <[email protected]> | 2018-03-20 21:11:58 +0000 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2018-03-21 18:56:47 +0200 |
| commit | 3dd92184d598e2dc9c7b0934796842f5c3745337 (patch) | |
| tree | e31e4089030156ac800036d60e6ae9fc6c07c8bb | |
| parent | e5cd376c2f61544f9906a383f88e5bea30558389 (diff) | |
i965: fix android build
This is the equivalent of commit 5770e1d89e0eb49eb3c9547e8657d636b6e7e5d7 for
android.
v2: fix xml files path and file given to --header
Signed-off-by: Lionel Landwerlin <[email protected]>
Signed-off-by: Tapani Pälli <[email protected]>
Fixes: 2d2b15fbcab ("i965: fix autotools/android build")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105634
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 8c4a613bcf3..324d087220a 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -309,13 +309,16 @@ intermediates := $(call local-generated-sources-dir) LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(i965_oa_GENERATED_FILES)) -i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \ +i965_oa_xml_FILES := $(addprefix $(MESA_TOP)/src/mesa/drivers/dri/i965/, \ $(i965_oa_xml_FILES)) $(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=$(call generated-sources-dir-for,SHARED_LIBRARIES,i965_dri,,)/brw_oa_metrics.h \ + $(i965_oa_xml_FILES) $(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c |