[Mesa-dev] [PATCH] android: intel/isl: remove redundant building rules

[Tapani Pälli]

Hi;

On 2/22/19 1:30 AM, Mauro Rossi wrote:
> Fixes the following building error:
> 
> including ./external/mesa/Android.mk ...
> build/core/base_rules.mk:183: *** external/mesa/src/intel:
> MODULE.TARGET.STATIC_LIBRARIES.libmesa_isl_tiled_memcpy already defined by external/mesa/src/intel.
> make: *** [build/core/ninja.mk:164: out/build-android_x86_64.ninja] Error 1

This is strange, craftyguy also reported same error .. I haven't seen 
this though.

> ISL_TILED_MEMCPY_FILES is isl/isl_tiled_memcpy_normal.c
> and that source file includes isl_tiled_memcpy.c source

Yes, that is intentional. We want to compile 2 versions of the library, 
'normal' one and 'sse41' one.

> Fixes: 96bb328 ("iris: add Android build")
> Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
> ---
>   src/intel/Android.isl.mk | 13 -------------
>   1 file changed, 13 deletions(-)
> 
> diff --git a/src/intel/Android.isl.mk b/src/intel/Android.isl.mk
> index 28944875e0..07a64b8ed1 100644
> --- a/src/intel/Android.isl.mk
> +++ b/src/intel/Android.isl.mk
> @@ -198,19 +198,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libmesa_genxml
>   include $(MESA_COMMON_MK)
>   include $(BUILD_STATIC_LIBRARY)
>   
> -
> -# ---------------------------------------
> -# Build libmesa_isl_tiled_memcpy
> -# ---------------------------------------
> -include $(CLEAR_VARS)
> -
> -LOCAL_MODULE := libmesa_isl_tiled_memcpy
> -
> -LOCAL_SRC_FILES := isl/isl_tiled_memcpy.c
> -
> -include $(MESA_COMMON_MK)
> -include $(BUILD_STATIC_LIBRARY)
> -
>   # ---------------------------------------
>   # Build libmesa_isl_tiled_memcpy
>   # ---------------------------------------
> 
             ^^^

Do you have libmesa_isl_tiled_memcpy 2 times there? This does not match 
what Mesa has ATM.

// Tapani