[Mesa-dev] [PATCH] android: fix build issues with genxml, isl

Mon Aug 29 04:39:03 UTC 2016

On 08/28/2016 03:51 AM, Mauro Rossi wrote:
> Hi Emil, Jason, Tapani,
>
> this weekend I had planned to check mesa-dev with marshmallow-x86 and
> nougat-x86,builds,
> so here you can find the port to android of commit
> bebc1a1d995e33f173ea207848bcddd81f6dd19a
>
> Built successfully and tested on Sandybridge.
> Added also the same formatted patch as attachment in case gmail causes problems.

Super, will test this. Did you notice that genxml blorp things won't 
work for gen < 8? This was at least the situation for me, I have 
disabled everything gen < 8 locally and was planning to take better look 
at why things fail later.

> Mauro
>
> From 4769f3e4b51fc804676d2b7b2ea320cfa5fffdde Mon Sep 17 00:00:00 2001
> From: Mauro Rossi <issor.oruam at gmail.com>
> Date: Sat, 27 Aug 2016 17:19:34 +0200
> Subject: [PATCH] android: intel: Flatten the makefile structure
>
> Android porting of commit bebc1a1 "intel: Flatten the makefile structure"
>
> Automake approach was followed, by moving makefiles a level up,
> naming them Android.genxml.mk and Android.isl.mk,
> performing the necessary adjustments to the paths,
> adding src/intel/Android.mk and fixing mesa top level makefile.
> ---
>  Android.mk                  |   3 +-
>  src/intel/Android.genxml.mk |  97 ++++++++++++++++++++
>  src/intel/Android.isl.mk    | 216 +++++++++++++++++++++++++++++++++++++++++++
>  src/intel/Android.mk        |  29 ++++++
>  src/intel/genxml/Android.mk |  97 --------------------
>  src/intel/isl/Android.mk    | 217 --------------------------------------------
>  6 files changed, 343 insertions(+), 316 deletions(-)
>  create mode 100644 src/intel/Android.genxml.mk
>  create mode 100644 src/intel/Android.isl.mk
>  create mode 100644 src/intel/Android.mk
>  delete mode 100644 src/intel/genxml/Android.mk
>  delete mode 100644 src/intel/isl/Android.mk
>
> diff --git a/Android.mk b/Android.mk
> index f673029..4a63384 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -90,8 +90,7 @@ SUBDIRS := \
>   src/mesa \
>   src/util \
>   src/egl \
> - src/intel/genxml \
> - src/intel/isl \
> + src/intel \
>   src/mesa/drivers/dri
>
>  INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
> diff --git a/src/intel/Android.genxml.mk b/src/intel/Android.genxml.mk
> new file mode 100644
> index 0000000..79de784
> --- /dev/null
> +++ b/src/intel/Android.genxml.mk
> @@ -0,0 +1,97 @@
> +# Copyright © 2016 Intel Corporation
> +# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice shall be included
> +# in all copies or substantial portions of the Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> +# DEALINGS IN THE SOFTWARE.
> +#
> +
> +# ---------------------------------------
> +# Build libmesa_genxml
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_genxml
> +
> +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +
> +intermediates := $(call local-generated-sources-dir)
> +
> +# dummy.c source file is generated to meet the build system's rules.
> +LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c
> +
> +$(intermediates)/dummy.c:
> + @mkdir -p $(dir $@)
> + @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
> + $(hide) touch $@
> +
> +# This is the list of auto-generated files headers
> +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/,
> $(GENXML_GENERATED_FILES))
> +
> +define header-gen
> + @mkdir -p $(dir $@)
> + @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
> + $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_XML) > $@
> +endef
> +
> +$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen4_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen4.xml
> +$(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/genxml/gen4.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen45_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen45.xml
> +$(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/genxml/gen45.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen5_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen5.xml
> +$(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/genxml/gen5.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen6.xml
> +$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/genxml/gen6.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen7.xml
> +$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/genxml/gen7.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen75.xml
> +$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/genxml/gen75.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen8.xml
> +$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/genxml/gen8.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/genxml/gen_pack_header.py
> +$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML :=
> $(LOCAL_PATH)/genxml/gen9.xml
> +$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/genxml/gen9.xml
> $(LOCAL_PATH)/genxml/gen_pack_header.py
> + $(call header-gen)
> +
> +LOCAL_EXPORT_C_INCLUDE_DIRS := \
> + $(MESA_TOP)/src/intel \
> + $(intermediates)
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
> new file mode 100644
> index 0000000..7e578af
> --- /dev/null
> +++ b/src/intel/Android.isl.mk
> @@ -0,0 +1,216 @@
> +# Copyright © 2016 Intel Corporation
> +# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice shall be included
> +# in all copies or substantial portions of the Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> +# DEALINGS IN THE SOFTWARE.
> +#
> +
> +# ---------------------------------------
> +# libmesa_isl_gen* common variables
> +# ---------------------------------------
> +
> +LIBISL_GENX_COMMON_INCLUDES := \
> + $(MESA_TOP)/src/ \
> + $(MESA_TOP)/src/mesa/drivers/dri/i965
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen4
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen4
> +
> +LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=40
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen5
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen5
> +
> +LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=50
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen6
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen6
> +
> +LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=60
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen7
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen7
> +
> +LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=70
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen75
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen75
> +
> +LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=75
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen8
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen8
> +
> +LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=80
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl_gen9
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl_gen9
> +
> +LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=90
> +
> +LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_isl
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_isl
> +
> +LOCAL_SRC_FILES := $(ISL_FILES)
> +
> +LOCAL_C_INCLUDES := \
> + $(MESA_TOP)/src/gallium/include \
> + $(MESA_TOP)/src/gallium/auxiliary \
> + $(MESA_TOP)/src/mapi \
> + $(MESA_TOP)/src/mesa \
> + $(MESA_TOP)/src/mesa/drivers/dri/i965 \
> +
> +LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
> +
> +LOCAL_WHOLE_STATIC_LIBRARIES := \
> + libmesa_isl_gen4 \
> + libmesa_isl_gen5 \
> + libmesa_isl_gen6 \
> + libmesa_isl_gen7 \
> + libmesa_isl_gen75 \
> + libmesa_isl_gen8 \
> + libmesa_isl_gen9
> +
> +# Autogenerated sources
> +
> +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +
> +intermediates := $(call local-generated-sources-dir)
> +
> +LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/,
> $(ISL_GENERATED_FILES))
> +
> +define bash-gen
> + @mkdir -p $(dir $@)
> + @echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))"
> + $(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out $@
> +endef
> +
> +isl_format_layout_deps := \
> + $(LOCAL_PATH)/isl/gen_format_layout.py \
> + $(LOCAL_PATH)/isl/isl_format_layout.csv
> +
> +$(intermediates)/isl/isl_format_layout.c: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/isl/gen_format_layout.py
> +$(intermediates)/isl/isl_format_layout.c: PRIVATE_CSV :=
> $(LOCAL_PATH)/isl/isl_format_layout.csv
> +$(intermediates)/isl/isl_format_layout.c: $(isl_format_layout_deps)
> + $(call bash-gen)
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/intel/Android.mk b/src/intel/Android.mk
> new file mode 100644
> index 0000000..114b111
> --- /dev/null
> +++ b/src/intel/Android.mk
> @@ -0,0 +1,29 @@
> +# Copyright © 2016 Intel Corporation
> +# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice shall be included
> +# in all copies or substantial portions of the Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> +# DEALINGS IN THE SOFTWARE.
> +#
> +
> +LOCAL_PATH := $(call my-dir)
> +
> +# Import variables
> +include $(LOCAL_PATH)/Makefile.sources
> +
> +include $(LOCAL_PATH)/Android.genxml.mk
> +include $(LOCAL_PATH)/Android.isl.mk
> diff --git a/src/intel/genxml/Android.mk b/src/intel/genxml/Android.mk
> deleted file mode 100644
> index 39b5e2c..0000000
> --- a/src/intel/genxml/Android.mk
> +++ /dev/null
> @@ -1,97 +0,0 @@
> -# Copyright © 2016 Intel Corporation
> -# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
> -#
> -# Permission is hereby granted, free of charge, to any person obtaining a
> -# copy of this software and associated documentation files (the "Software"),
> -# to deal in the Software without restriction, including without limitation
> -# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> -# and/or sell copies of the Software, and to permit persons to whom the
> -# Software is furnished to do so, subject to the following conditions:
> -#
> -# The above copyright notice and this permission notice shall be included
> -# in all copies or substantial portions of the Software.
> -#
> -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> -# DEALINGS IN THE SOFTWARE.
> -
> -LOCAL_PATH := $(call my-dir)
> -
> -# Import variable GENERATED_FILES.
> -include $(LOCAL_PATH)/Makefile.sources
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_genxml
> -
> -LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> -
> -intermediates := $(call local-generated-sources-dir)
> -
> -# dummy.c source file is generated to meet the build system's rules.
> -LOCAL_GENERATED_SOURCES += $(intermediates)/dummy.c
> -
> -$(intermediates)/dummy.c:
> - @mkdir -p $(dir $@)
> - @echo "Gen Dummy: $(PRIVATE_MODULE) <= $(notdir $(@))"
> - $(hide) touch $@
> -
> -# This is the list of auto-generated files headers
> -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/genxml/,
> $(GENXML_GENERATED_FILES))
> -
> -define header-gen
> - @mkdir -p $(dir $@)
> - @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
> - $(hide) $(PRIVATE_SCRIPT) $(PRIVATE_XML) > $@
> -endef
> -
> -$(intermediates)/genxml/gen4_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen4_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen4.xml
> -$(intermediates)/genxml/gen4_pack.h: $(LOCAL_PATH)/gen4.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen45_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen45_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen45.xml
> -$(intermediates)/genxml/gen45_pack.h: $(LOCAL_PATH)/gen45.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen5_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen5_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen5.xml
> -$(intermediates)/genxml/gen5_pack.h: $(LOCAL_PATH)/gen5.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen6_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen6_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen6.xml
> -$(intermediates)/genxml/gen6_pack.h: $(LOCAL_PATH)/gen6.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen7_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen7_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen7.xml
> -$(intermediates)/genxml/gen7_pack.h: $(LOCAL_PATH)/gen7.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen75_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen75_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen75.xml
> -$(intermediates)/genxml/gen75_pack.h: $(LOCAL_PATH)/gen75.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen8_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen8_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen8.xml
> -$(intermediates)/genxml/gen8_pack.h: $(LOCAL_PATH)/gen8.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -$(intermediates)/genxml/gen9_pack.h: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_pack_header.py
> -$(intermediates)/genxml/gen9_pack.h: PRIVATE_XML := $(LOCAL_PATH)/gen9.xml
> -$(intermediates)/genxml/gen9_pack.h: $(LOCAL_PATH)/gen9.xml
> $(LOCAL_PATH)/gen_pack_header.py
> - $(call header-gen)
> -
> -LOCAL_EXPORT_C_INCLUDE_DIRS := \
> - $(MESA_TOP)/src/intel \
> - $(intermediates)
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/intel/isl/Android.mk b/src/intel/isl/Android.mk
> deleted file mode 100644
> index e2771ad..0000000
> --- a/src/intel/isl/Android.mk
> +++ /dev/null
> @@ -1,217 +0,0 @@
> -# Copyright © 2016 Intel Corporation
> -# Copyright © 2016 Mauro Rossi <issor.oruam at gmail.com>
> -#
> -# Permission is hereby granted, free of charge, to any person obtaining a
> -# copy of this software and associated documentation files (the "Software"),
> -# to deal in the Software without restriction, including without limitation
> -# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> -# and/or sell copies of the Software, and to permit persons to whom the
> -# Software is furnished to do so, subject to the following conditions:
> -#
> -# The above copyright notice and this permission notice shall be included
> -# in all copies or substantial portions of the Software.
> -#
> -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> -# DEALINGS IN THE SOFTWARE.
> -#
> -
> -LOCAL_PATH := $(call my-dir)
> -
> -# Import variables LIBISL_FILES.
> -include $(LOCAL_PATH)/Makefile.sources
> -
> -LIBISL_GENX_COMMON_INCLUDES := \
> - $(MESA_TOP)/src/ \
> - $(MESA_TOP)/src/mesa/drivers/dri/i965
> -
> -# ---------------------------------------
> -# Build libisl_gen4
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen4
> -
> -LOCAL_SRC_FILES := $(ISL_GEN4_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=40
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen5
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen5
> -
> -LOCAL_SRC_FILES := $(ISL_GEN5_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=50
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen6
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen6
> -
> -LOCAL_SRC_FILES := $(ISL_GEN6_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=60
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen7
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen7
> -
> -LOCAL_SRC_FILES := $(ISL_GEN7_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=70
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen75
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen75
> -
> -LOCAL_SRC_FILES := $(ISL_GEN75_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=75
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen8
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen8
> -
> -LOCAL_SRC_FILES := $(ISL_GEN8_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=80
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl_gen9
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_gen9
> -
> -LOCAL_SRC_FILES := $(ISL_GEN9_FILES)
> -
> -LOCAL_CFLAGS := -DGEN_VERSIONx10=90
> -
> -LOCAL_C_INCLUDES := $(LIBISL_GENX_COMMON_INCLUDES)
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
> -# ---------------------------------------
> -# Build libisl
> -# ---------------------------------------
> -
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl
> -
> -LOCAL_SRC_FILES := $(ISL_FILES)
> -
> -LOCAL_C_INCLUDES := \
> - $(MESA_TOP)/src/gallium/include \
> - $(MESA_TOP)/src/gallium/auxiliary \
> - $(MESA_TOP)/src/mapi \
> - $(MESA_TOP)/src/mesa \
> - $(MESA_TOP)/src/mesa/drivers/dri/i965 \
> -
> -LOCAL_EXPORT_C_INCLUDE_DIRS := $(MESA_TOP)/src/intel
> -
> -LOCAL_WHOLE_STATIC_LIBRARIES := \
> - libmesa_isl_gen4 \
> - libmesa_isl_gen5 \
> - libmesa_isl_gen6 \
> - libmesa_isl_gen7 \
> - libmesa_isl_gen75 \
> - libmesa_isl_gen8 \
> - libmesa_isl_gen9
> -
> -# Autogenerated sources
> -
> -LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> -
> -intermediates := $(call local-generated-sources-dir)
> -
> -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/,
> $(ISL_GENERATED_FILES))
> -
> -define bash-gen
> - @mkdir -p $(dir $@)
> - @echo "Gen Bash: $(PRIVATE_MODULE) <= $(notdir $(@))"
> - $(hide) $(PRIVATE_SCRIPT) --csv $(PRIVATE_CSV) --out $@
> -endef
> -
> -isl_format_layout_deps := \
> - $(LOCAL_PATH)/gen_format_layout.py \
> - $(LOCAL_PATH)/isl_format_layout.csv
> -
> -$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT :=
> $(MESA_PYTHON2) $(LOCAL_PATH)/gen_format_layout.py
> -$(intermediates)/isl_format_layout.c: PRIVATE_CSV :=
> $(LOCAL_PATH)/isl_format_layout.csv
> -$(intermediates)/isl_format_layout.c: $(isl_format_layout_deps)
> - $(call bash-gen)
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
>