[Mesa-dev] [PATCH v1 7/7] android: build imx-drm winsys

[Tapani Pälli]

On 06/15/2017 11:47 PM, Robert Foss wrote:
> From: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> 
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> ---
>   Android.mk                            |  5 +++--
>   src/gallium/Android.mk                |  1 +
>   src/gallium/winsys/imx/drm/Android.mk | 40 +++++++++++++++++++++++++++++++++++
>   3 files changed, 44 insertions(+), 2 deletions(-)
>   create mode 100644 src/gallium/winsys/imx/drm/Android.mk
> 
> diff --git a/Android.mk b/Android.mk
> index b4dc8321a6..7622004d2d 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -24,7 +24,7 @@
>   # BOARD_GPU_DRIVERS should be defined.  The valid values are
>   #
>   #   classic drivers: i915 i965
> -#   gallium drivers: swrast freedreno i915g nouveau r300g r600g radeonsi vc4 virgl vmwgfx etnaviv
> +#   gallium drivers: swrast freedreno i915g nouveau r300g r600g radeonsi vc4 virgl vmwgfx etnaviv imx
>   #
>   # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
>   # module will also be built.  DRI modules will be loaded by libGLES_mesa.
> @@ -57,7 +57,8 @@ gallium_drivers := \
>   	vmwgfx.HAVE_GALLIUM_VMWGFX \
>   	vc4.HAVE_GALLIUM_VC4 \
>   	virgl.HAVE_GALLIUM_VIRGL \
> -	etnaviv.HAVE_GALLIUM_ETNAVIV
> +	etnaviv.HAVE_GALLIUM_ETNAVIV \
> +	imx.HAVE_GALLIUM_IMX
>   
>   ifeq ($(BOARD_GPU_DRIVERS),all)
>   MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
> diff --git a/src/gallium/Android.mk b/src/gallium/Android.mk
> index 0280574405..2710831588 100644
> --- a/src/gallium/Android.mk
> +++ b/src/gallium/Android.mk
> @@ -44,6 +44,7 @@ SUBDIRS += winsys/vc4/drm drivers/vc4
>   SUBDIRS += winsys/virgl/drm winsys/virgl/vtest drivers/virgl
>   SUBDIRS += winsys/svga/drm drivers/svga
>   SUBDIRS += winsys/etnaviv/drm drivers/etnaviv drivers/renderonly
> +SUBDIRS += winsys/imx/drm
>   SUBDIRS += state_trackers/dri
>   
>   # sort to eliminate any duplicates
> diff --git a/src/gallium/winsys/imx/drm/Android.mk b/src/gallium/winsys/imx/drm/Android.mk
> new file mode 100644
> index 0000000000..d4144f34aa
> --- /dev/null
> +++ b/src/gallium/winsys/imx/drm/Android.mk
> @@ -0,0 +1,40 @@
> +# Copyright (C) 2016 Linaro, Ltd, Rob Herring <robh at kernel.org>
> +#
> +# 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)
> +
> +# get C_SOURCES
> +#include $(LOCAL_PATH)/Makefile.sources

copypaste leftover? can be removed

> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_SRC_FILES := imx_drm_winsys.c
> +
> +LOCAL_SHARED_LIBRARIES := libdrm_etnaviv
> +
> +LOCAL_MODULE := libmesa_winsys_imx
> +
> +include $(GALLIUM_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +ifneq ($(HAVE_GALLIUM_FREEDRENO),)
> +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) libmesa_winsys_freedreno)
> +$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES))
> +endif
>