isl: add support for Android libmesa_isl static library
isl library is needed to build i965, libmesa_isl static library is added
to fix related Android building errors.
Any attempt to build libmesa_genxml as phony package module failed to deliver
gen{7,75,8,9}_pack.h generated headers, needed for libmesa_isl_gen{7,75,8,9}
Due to constraints in Android Build System, libmesa_genxml is built as static,
at least one source is needed, so dummy.c is autogenerated for this scope,
libmesa_genxml dependency is declared using LOCAL_WHOLE_STATIC_LIBRARIES,
to avoid building errors due to missing genxml/gen{7,75,8,9}_pack.h headers.
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Mauro Rossi
committed by
Emil Velikov
Emil Velikov
parent
4143245c23
commit
278c2212ac
@@ -95,6 +95,8 @@ SUBDIRS := \
|
|||||||
src/mesa \
|
src/mesa \
|
||||||
src/util \
|
src/util \
|
||||||
src/egl \
|
src/egl \
|
||||||
|
src/intel/genxml \
|
||||||
|
src/intel/isl \
|
||||||
src/mesa/drivers/dri
|
src/mesa/drivers/dri
|
||||||
|
|
||||||
INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
|
INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
|
||||||
|
|||||||
82
src/intel/genxml/Android.mk
Normal file
82
src/intel/genxml/Android.mk
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
# Copyright © 2016 Intel Corporation
|
||||||
|
# Copyright © 2016 Mauro Rossi <issor.oruam@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/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)
|
||||||
155
src/intel/isl/Android.mk
Normal file
155
src/intel/isl/Android.mk
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
# Copyright © 2016 Intel Corporation
|
||||||
|
# Copyright © 2016 Mauro Rossi <issor.oruam@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_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/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_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) < $(PRIVATE_CSV) > $@
|
||||||
|
endef
|
||||||
|
|
||||||
|
isl_format_layout_deps := \
|
||||||
|
$(LOCAL_PATH)/isl_format_layout_gen.bash \
|
||||||
|
$(LOCAL_PATH)/isl_format_layout.csv
|
||||||
|
|
||||||
|
$(intermediates)/isl_format_layout.c: PRIVATE_SCRIPT := bash -c $(LOCAL_PATH)/isl_format_layout_gen.bash
|
||||||
|
$(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)
|
||||||
@@ -52,7 +52,8 @@ LOCAL_SRC_FILES := \
|
|||||||
$(i965_FILES)
|
$(i965_FILES)
|
||||||
|
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||||
$(MESA_DRI_WHOLE_STATIC_LIBRARIES)
|
$(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
|
||||||
|
libmesa_isl
|
||||||
|
|
||||||
LOCAL_SHARED_LIBRARIES := \
|
LOCAL_SHARED_LIBRARIES := \
|
||||||
$(MESA_DRI_SHARED_LIBRARIES) \
|
$(MESA_DRI_SHARED_LIBRARIES) \
|
||||||
|
|||||||
Reference in New Issue
Block a user