android: intel/isl: remove redundant building rules
authorMauro Rossi <issor.oruam@gmail.com>
Thu, 21 Feb 2019 23:30:38 +0000 (00:30 +0100)
committerTapani Pälli <tapani.palli@intel.com>
Fri, 22 Feb 2019 05:56:11 +0000 (07:56 +0200)
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 <issor.oruam@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
src/intel/Android.isl.mk

index 28944875e08dc3d1a7c5b208b3b0f2e02e1c9054..07a64b8ed1c23bf845ec27e62953f17795344495 100644 (file)
@@ -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
 # ---------------------------------------