[Mesa-dev] [PATCH] android: intel/genxml: add rules to generate xml headers

[Mauro Rossi]

2016-10-10 13:04 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
> Hi Mauro,
>
> On 9 October 2016 at 11:13, Mauro Rossi <issor.oruam at gmail.com> wrote:
>
>> New generated headers were introduced by commit 63a366a
>> "intel: aubinator: generate a standalone binary"
>>
>> Once the generated files are listed in Makefile.sources variables,
>> Android build system requires rules to avoid building error.
>>
>> New macro xml-header-gen is basically a copy&paste of automake rules,
>> but xxd is invoked directly, as Android build systems stops and shows the error
>> in case of xxd missing.
>>
>> Existing macro header-gen is renamed to pack-header-gen as a refinement.
>> ---
>>  src/intel/Android.genxml.mk | 42 +++++++++++++++++++++++++++++++++---------
>>  1 file changed, 33 insertions(+), 9 deletions(-)
>>
> I second Jason here - the headers are not (and likely won't be anytime
> soon) applicable for Android.
>
> The simple fix would be to split the headers introduced with above
> commit to a separate list in the Makefile.sources file and append that
> one to the BUILT_SOURCES list in src/intel/Makefile.genxml.am. Please
> give that a try.
>
> Thanks
> Emil

Hi Jason, Emil,

thanks for the explanations, at this point intel/tools is not built in android.

Here follows the minimal patch with changes suggested by Emil

Mauro


>From 5ea801cd3edb6657fd6e73ac6f476459e328e48d Mon Sep 17 00:00:00 2001
From: Mauro Rossi <issor.oruam at gmail.com>
Date: Mon, 10 Oct 2016 23:43:42 +0200
Subject: [PATCH] intel/genxml: fix building rules for aubinator required
 headers

New generated headers were introduced by commit 63a366a
"intel: aubinator: generate a standalone binary"

Android does not need aubinator yet, so in order to avoid building error,
aubinator required new genxml headers are defined in a separate list.

If required, building rules for Android will be added later.
---
 src/intel/Makefile.genxml.am | 2 +-
 src/intel/Makefile.sources   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/intel/Makefile.genxml.am b/src/intel/Makefile.genxml.am
index 160a411..08ac81b 100644
--- a/src/intel/Makefile.genxml.am
+++ b/src/intel/Makefile.genxml.am
@@ -19,7 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.

-BUILT_SOURCES += $(GENXML_GENERATED_FILES)
+BUILT_SOURCES += $(GENXML_GENERATED_FILES) $(AUBINATOR_GENXML_HEADERS)

 SUFFIXES = _pack.h _xml.h .xml

diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 5b759bf..272e3c8 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -21,7 +21,9 @@ GENXML_GENERATED_FILES = \
  genxml/gen7_pack.h \
  genxml/gen75_pack.h \
  genxml/gen8_pack.h \
- genxml/gen9_pack.h \
+ genxml/gen9_pack.h
+
+AUBINATOR_GENXML_HEADERS = \
  genxml/gen6_xml.h \
  genxml/gen7_xml.h \
  genxml/gen75_xml.h \
-- 
2.9.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-intel-genxml-fix-building-rules-for-aubinator-requir.patch
Type: text/x-patch
Size: 1556 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161011/7a8ab350/attachment.bin>