Mesa (master): android: intel: genxml: fix genX_xml.h generation rules

[Tapani Pälli]

Module: Mesa
Branch: master
Commit: 72175bd2a590a6d8109eedc5e60ce0ceb43bedb1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=72175bd2a590a6d8109eedc5e60ce0ceb43bedb1

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Apr  1 12:50:33 2017 +0200

android: intel: genxml: fix genX_xml.h generation rules

Recent changes in Makefile.sources merged the aubinator files in
a unique list of generated files and genxml/genX_xml.h is now needed
to avoid the following building error:

ninja: error: '.../genxml/genX_xml.h', needed by '.../genxml/genX_xml.h',
missing and no known rule to make it
build/core/ninja.mk:148: recipe for target 'ninja_wrapper' failed

Fixes: 0f83c05 "intel: genxml: compress all gen files into one"
Acked-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/Android.genxml.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk
index 842d0e13a3..4b0746c245 100644
--- a/src/intel/Android.genxml.mk
+++ b/src/intel/Android.genxml.mk
@@ -96,6 +96,11 @@ $(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/genxml/gen9.xm
 $(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml $(LOCAL_PATH)/genxml/gen_pack_header.py
 	$(call header-gen)
 
+$(intermediates)/genxml/genX_xml.h: $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py
+	@mkdir -p $(dir $@)
+	@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	$(hide) $(MESA_PYTHON2) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py $(addprefix $(MESA_TOP)/src/intel/,$(GENXML_XML_FILES)) > $@ || (rm -f $@; false)
+
 LOCAL_EXPORT_C_INCLUDE_DIRS := \
 	$(MESA_TOP)/src/intel \
 	$(intermediates)