[Mesa-dev] [PATCH] android: i965: add per-gen libmesa_i965_gen{4, 45, 5} static

[Tapani Pälli]

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

On 05/06/2017 05:03 PM, Mauro Rossi wrote:
> Needed to fix android building errors:
> 
> external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:148: error: undefined reference to 'gen5_init_atoms'
> external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:150: error: undefined reference to 'gen45_init_atoms'
> external/mesa/src/mesa/drivers/dri/i965/brw_state_upload.c:152: error: undefined reference to 'gen4_init_atoms'
> clang++: error: linker command failed with exit code 1 (use -v to see invocation)
> 
> Fixes: 5a19d0b "i965: Get real per-gen atom lists"
> ---
>   src/mesa/drivers/dri/i965/Android.mk | 66 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 66 insertions(+)
> 
> diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
> index ac0a4446b9..7c4fadaa46 100644
> --- a/src/mesa/drivers/dri/i965/Android.mk
> +++ b/src/mesa/drivers/dri/i965/Android.mk
> @@ -40,6 +40,9 @@ I965_PERGEN_STATIC_LIBRARIES := \
>   	libmesa_nir
>   
>   I965_PERGEN_LIBS := \
> +	libmesa_i965_gen4 \
> +	libmesa_i965_gen45 \
> +	libmesa_i965_gen5 \
>   	libmesa_i965_gen6 \
>   	libmesa_i965_gen7 \
>   	libmesa_i965_gen75 \
> @@ -47,6 +50,69 @@ I965_PERGEN_LIBS := \
>   	libmesa_i965_gen9
>   
>   # ---------------------------------------
> +# Build libmesa_i965_gen4
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_i965_gen4
> +
> +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(i965_gen4_FILES)
> +
> +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
> +
> +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=40
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_i965_gen45
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_i965_gen45
> +
> +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(i965_gen45_FILES)
> +
> +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
> +
> +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=45
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
> +# Build libmesa_i965_gen5
> +# ---------------------------------------
> +
> +include $(CLEAR_VARS)
> +
> +LOCAL_MODULE := libmesa_i965_gen5
> +
> +LOCAL_C_INCLUDES := $(I965_PERGEN_COMMON_INCLUDES)
> +
> +LOCAL_SRC_FILES := $(i965_gen5_FILES)
> +
> +LOCAL_SHARED_LIBRARIES := $(I965_PERGEN_SHARED_LIBRARIES)
> +
> +LOCAL_STATIC_LIBRARIES := $(I965_PERGEN_STATIC_LIBRARIES)
> +
> +LOCAL_CFLAGS := -DGEN_VERSIONx10=50
> +
> +include $(MESA_COMMON_MK)
> +include $(BUILD_STATIC_LIBRARY)
> +
> +# ---------------------------------------
>   # Build libmesa_i965_gen6
>   # ---------------------------------------
>   
>