From 338dacc3415dc6a11040aa68c17db1213738d911 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Fri, 22 Feb 2019 00:30:38 +0100 Subject: [PATCH] android: intel/isl: remove redundant building rules MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 ISL_TILED_MEMCPY_FILES is isl/isl_tiled_memcpy_normal.c and that source file includes isl_tiled_memcpy.c source Fixes: 96bb328 ("iris: add Android build") Signed-off-by: Mauro Rossi Reviewed-by: Tapani Pälli --- 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 28944875e08..07a64b8ed1c 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 # --------------------------------------- -- 2.30.2