[Mesa-dev] [PATCH] android: enable building static version of libdrm

[Chih-Wei Huang]

Rob Herring 於 西元2016年01月14日 00:20 寫道:
> From: Sumit Semwal <sumit.semwal at linaro.org>
>
> Android needs libdrm built statically for recovery;
> enable that as well.
>
> Signed-off-by: Sumit Semwal <sumit.semwal at linaro.org>
> Signed-off-by: Rob Herring <robh at kernel.org>
> Cc: Chih-Wei Huang <cwhuang at linux.org.tw>
> Cc: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>   Android.mk | 19 +++++++++++++++++++
>   1 file changed, 19 insertions(+)
>
> diff --git a/Android.mk b/Android.mk
> index 90cdcb3..1d8cd65 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -27,6 +27,8 @@ include $(CLEAR_VARS)
>   # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES
>   include $(LOCAL_PATH)/Makefile.sources
>
> +#static library for the device (recovery)
> +include $(CLEAR_VARS)
>   LOCAL_MODULE := libdrm
>   LOCAL_MODULE_TAGS := optional
>
> @@ -41,7 +43,24 @@ LOCAL_C_INCLUDES := \
>   LOCAL_CFLAGS := \
>   	-DHAVE_VISIBILITY=1 \
>   	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# Shared library for the device
> +include $(CLEAR_VARS)
> +LOCAL_MODULE := libdrm
> +LOCAL_MODULE_TAGS := optional
>
> +LOCAL_SRC_FILES := $(LIBDRM_FILES)
> +LOCAL_EXPORT_C_INCLUDE_DIRS := \
> +        $(LOCAL_PATH) \
> +        $(LOCAL_PATH)/include/drm
> +
> +LOCAL_C_INCLUDES := \
> +        $(LOCAL_PATH)/include/drm
> +
> +LOCAL_CFLAGS := \
> +        -DHAVE_VISIBILITY=1 \
> +        -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
>   include $(BUILD_SHARED_LIBRARY)
>
>   include $(call all-makefiles-under,$(LOCAL_PATH))

Looks good to me.
We have applied an equivalent patch to
our marshmallow-x86 porting.