[Mesa-dev] [PATCH 3/5] dri: Build libmesa_dri_common for Android

[Chia-I Wu]

On Tue, Aug 30, 2011 at 2:50 AM, Chad Versace <chad at chad-versace.us> wrote:
> libmesa_dri_common is a static library that contains the sources in
> src/mesa/drivers/dri/common. Each DRI driver should link to it.
>
> v2
> ----
> - [olv] In toplevel Android.mk, replace subdir src/mesa/drivers/dri/common
>  with src/mesa/drivers/dri, and add the subdir only if MESA_BUILD_CLASSIC.
> - [olv] Remove redundant ifdef guard in src/mesa/drivers/dri/common/Android.mk
>
> CC: Chia-I Wu <olv at lunarg.com>
> Signed-off-by: Chad Versace <chad at chad-versace.us>
> ---
>  Android.mk                             |    4 ++-
>  src/mesa/drivers/dri/Android.mk        |   27 +++++++++++++++++++++
>  src/mesa/drivers/dri/common/Android.mk |   41 ++++++++++++++++++++++++++++++++
>  3 files changed, 71 insertions(+), 1 deletions(-)
>  create mode 100644 src/mesa/drivers/dri/Android.mk
>  create mode 100644 src/mesa/drivers/dri/common/Android.mk
>
> diff --git a/Android.mk b/Android.mk
> index bc4b74e..2ad83a0 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -78,7 +78,9 @@ SUBDIRS := \
>        src/egl/main
>
>  ifeq ($(strip $(MESA_BUILD_CLASSIC)),true)
> -SUBDIRS += src/egl/drivers/dri2
> +SUBDIRS += \
> +       src/egl/drivers/dri2 \
> +       src/mesa/drivers/dri
>  endif
>
>  ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
> diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
> new file mode 100644
> index 0000000..05b02cb
> --- /dev/null
> +++ b/src/mesa/drivers/dri/Android.mk
> @@ -0,0 +1,27 @@
> +#
> +# Copyright (C) 2011 Intel Corporation
> +#
> +# 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)
> +
> +SUBDIRS := common
> +
> +include $(foreach d, $(SUBDIRS), $(LOCAL_PATH)/$(d)/Android.mk)
> diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
> new file mode 100644
> index 0000000..76464a1
> --- /dev/null
> +++ b/src/mesa/drivers/dri/common/Android.mk
> @@ -0,0 +1,41 @@
> +#
> +# Mesa 3-D graphics library
> +#
> +# Copyright (C) 2011 Intel Corporation
> +#
> +# 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_dri_common
> +#
> +
> +LOCAL_PATH := $(call my-dir)
> +include $(CLEAR_VARS)
> +
> +include $(LOCAL_PATH)/Makefile.sources
> +
> +LOCAL_MODULE := libmesa_dri_common
> +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE_CLASS is optional unless you need to generate files.  I
am fine either way though.
> +LOCAL_C_INCLUDES := $(MESA_DRI_C_INCLUDES)
MESA_DRI_C_INCLUDES is not defined anywhere.  But I suppose that is
fine as there is no way to build libmesa_dri_common yet.

With or without the changes,

Reviewed-by: Chia-I Wu <olv at lunarg.com>
> +LOCAL_SRC_FILES := $(mesa_dri_common_SOURCES)

> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> --
> 1.7.6
>
>



-- 
olv at LunarG.com