[Mesa-dev] [PATCH] android: add megadriver_stub

[Emil Velikov]

On 28/10/13 08:07, Adrian Negreanu wrote:
> From: Adrian Negreanu <adrian.m.negreanu at intel.com>
> 
> Fixes linker error:
>   ld: .../libmesa_dri_common_intermediates/libmesa_dri_common.a(dri_util.o):
>   in function globalDriverAPI:dri_util.c(.data.rel+0x0): error: undefined
>   reference to 'driDriverAPI'
> 
Hi Adrian,

To be honest, with dricore gone I was expecting bigger issues. From what
I can see the only way to get around that(missing dricore) is to build
without MESA_BUILD_CLASSIC (i.e. without i915 i965).

Would you mind sharing some light and/or cleaning
src/mesa/Android.libmesa_dricore.mk ?

Additionally what can one do it he wishes to change/update parts of the
Android build system?

I've been trying to cleanup, and provide some symmetry to the three
build systems, and I'm currently short of an Android setup.

Is there a VM that can be used to at least compile test patches ? ...or
a person/build bot that we can ping to compile/run test any changes?

Big thanks,
Emil

> Signed-off-by: Adrian Negreanu <adrian.m.negreanu at intel.com>
The patch looks good to me.
FWIW Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>

> ---
>  src/mesa/drivers/dri/Android.mk              |  1 +
>  src/mesa/drivers/dri/common/Android.mk       | 18 ++++++++++++++++++
>  src/mesa/drivers/dri/common/Makefile.sources |  2 ++
>  3 files changed, 21 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
> index 9adf0b3..54dc02d 100644
> --- a/src/mesa/drivers/dri/Android.mk
> +++ b/src/mesa/drivers/dri/Android.mk
> @@ -44,6 +44,7 @@ MESA_DRI_C_INCLUDES := \
>  MESA_DRI_WHOLE_STATIC_LIBRARIES := \
>  	libmesa_glsl \
>  	libmesa_dri_common \
> +	libmegadriver_stub \
>  	libmesa_dricore
>  
>  MESA_DRI_SHARED_LIBRARIES := \
> diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
> index b3dac29..7930e7b 100644
> --- a/src/mesa/drivers/dri/common/Android.mk
> +++ b/src/mesa/drivers/dri/common/Android.mk
> @@ -86,3 +86,21 @@ $(intermediates)/xmlpool/options.h: $$(PRIVATE_SCRIPT) $$(PRIVATE_TEMPLATE_HEADE
>  
>  include $(MESA_COMMON_MK)
>  include $(BUILD_STATIC_LIBRARY)
> +
> +
> +
> +#
> +# Build libmegadriver_stub
> +#
> +include $(CLEAR_VARS)
> +include $(LOCAL_PATH)/Makefile.sources
> +
> +LOCAL_MODULE := libmegadriver_stub
> +LOCAL_MODULE_CLASS := STATIC_LIBRARIES
> +LOCAL_C_INCLUDES := \
> +    $(MESA_DRI_C_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(libmegadriver_stub_SOURCES)
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources
> index 040b717..7161e63 100644
> --- a/src/mesa/drivers/dri/common/Makefile.sources
> +++ b/src/mesa/drivers/dri/common/Makefile.sources
> @@ -14,3 +14,5 @@ mesa_dri_common_INCLUDES := \
>  	src/mapi \
>  	src/mesa \
>  	src/mesa/drivers/dri/common
> +
> +libmegadriver_stub_SOURCES = megadriver_stub.c
>