<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2016-06-01 2:22 GMT+02:00 Mauro Rossi <span dir="ltr"><<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">2016-05-31 16:33 GMT+02:00 Emil Velikov <span dir="ltr"><<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>></span>:<br></span><div><div class="h5"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Mauro,<br> <br> A couple of questions, nothing serious imho.<br> <div><div><br> On 30 May 2016 at 23:20, Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>> wrote:<br> > isl library is needed to build i965, libmesa_isl static library is added<br> > to fix related Android building errors.<br> ><br> > Any attempt to build libmesa_genxml as phony package module failed to deliver<br> > gen{7,75,8,9}_pack.h autogenerated headers, needed to build libmesa_isl_gen{7,75,8,9}<br> ><br> > Due to constraints in the Android Build System, libmesa_genxml is built as static library<br> > and at least one source file needs to be compiled, so dummy.c is autogenerated for this scope.<br> ><br> > libmesa_isl_gen{7,75,8,9} dependencies on libmesa_genxml are declared using LOCAL_WHOLE_STATIC_LIBRARIES,<br> > in order to avoid building errors due to missing genxml/gen{7,75,8,9}_pack.h headers<br> ><br> > Cc: <<a href="mailto:mesa-stable@lists.freedesktop.org" target="_blank">mesa-stable@lists.freedesktop.org</a>><br> > ---<br> > Android.mk | 3 +<br> > src/intel/genxml/Android.mk | 82 ++++++++++++++++++<br> > src/intel/isl/Android.mk | 157 +++++++++++++++++++++++++++++++++++<br> > src/mesa/drivers/dri/i965/Android.mk | 3 +-<br> > 4 files changed, 244 insertions(+), 1 deletion(-)<br> > create mode 100644 src/intel/genxml/Android.mk<br> > create mode 100644 src/intel/isl/Android.mk<br> ><br> > diff --git a/Android.mk b/Android.mk<br> > index 6a5596b..8ab80f3 100644<br> > --- a/Android.mk<br> > +++ b/Android.mk<br> > @@ -48,6 +48,7 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(M<br> ><br> > MESA_COMMON_MK := $(MESA_TOP)/<a href="http://Android.common.mk" rel="noreferrer" target="_blank">Android.common.mk</a><br> > MESA_PYTHON2 := python<br> > +MESA_PYTHON3 := python3<br></div></div></blockquote><div><br></div></div></div><div>I've just seen that while a few days ago python3 was necessary to build gen%_pack.h headers,</div><div>now the .py scripts just require python2, so this MESA_PYTHON3 definition is not needed anymore.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5"><div><div> > new file mode 100644<br> > index 0000000..e0137d5<br> > --- /dev/null<br> > +++ b/src/intel/genxml/Android.mk<br> > @@ -0,0 +1,82 @@<br> > +# Copyright © 2016 Intel Corporation<br> > +# Copyright © 2016 Mauro Rossi <<a href="mailto:issor.oruam@gmail.com" target="_blank">issor.oruam@gmail.com</a>><br> > +#<br> > +# Permission is hereby granted, free of charge, to any person obtaining a<br> > +# copy of this software and associated documentation files (the "Software"),<br> > +# to deal in the Software without restriction, including without limitation<br> > +# the rights to use, copy, modify, merge, publish, distribute, sublicense,<br> > +# and/or sell copies of the Software, and to permit persons to whom the<br> > +# Software is furnished to do so, subject to the following conditions:<br> > +#<br> > +# The above copyright notice and this permission notice shall be included<br> > +# in all copies or substantial portions of the Software.<br> > +#<br> > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br> > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br> > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL<br> > +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br> > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING<br> > +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER<br> > +# DEALINGS IN THE SOFTWARE.<br> > +<br> > +LOCAL_PATH := $(call my-dir)<br> > +<br> > +# Import variable GENERATED_FILES.<br> > +include $(LOCAL_PATH)/Makefile.sources<br> > +<br> > +include $(CLEAR_VARS)<br> > +<br> > +LOCAL_MODULE := libmesa_genxml<br> > +<br> > +LOCAL_MODULE_CLASS := STATIC_LIBRARIES<br> > +<br> </div></div></div></div><div><div class="h5"><div><div>> +intermediates := $(call local-generated-sources-dir)<br> > +<br> > +# dummy.c source file is generated to meet the build system's rules.<br> > +LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c<br> > +<br> > +$(intermediates)/dummy.c:<br> > + @mkdir -p $(dir $@)<br> > + @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"<br> > + $(hide) touch $@<br> > +<br> > +# This is the list of auto-generated files headers<br> > +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/genxml/, $(GENXML_GENERATED_FILES))<br> > +<br> > +define header-gen<br> > + @mkdir -p $(dir $@)<br> > + @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"<br> > + $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_XML) > $@<br> > +endef<br> > +<br> > +$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/gen_pack_header.py<br> > +$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen6.xml<br> > +$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/gen6.xml $(LOCAL_PATH)/gen_pack_header.py<br> > + $(call header-gen)<br> > +<br> > +$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/gen_pack_header.py<br> > +$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen7.xml<br> > +$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/gen7.xml $(LOCAL_PATH)/gen_pack_header.py<br> > + $(call header-gen)<br> > +<br> > +$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/gen_pack_header.py<br> > +$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen75.xml<br> > +$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/gen75.xml $(LOCAL_PATH)/gen_pack_header.py<br> > + $(call header-gen)<br> > +<br> > +$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/gen_pack_header.py<br> > +$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen8.xml<br> > +$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/gen8.xml $(LOCAL_PATH)/gen_pack_header.py<br> > + $(call header-gen)<br> > +<br> > +$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON3) $(LOCAL_PATH)/gen_pack_header.py<br> > +$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen9.xml<br> > +$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/gen9.xml $(LOCAL_PATH)/gen_pack_header.py<br> > + $(call header-gen)<br></div></div></div></div></blockquote><div><br></div></div></div></div></blockquote></div></div><div class="gmail_extra">...and these PRIVATE SCRIPTS will use use $(MESA_PYTHON) as $(MESA_PYTHON3) not needed anymore</div></div>