1 files changed, 7 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 41ed188e6d..4427bd4fee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -82,7 +82,6 @@ cc_library_static {
         "src/core/CL/kernels/CLAccumulateKernel.cpp",
         "src/core/CL/kernels/CLActivationLayerKernel.cpp",
         "src/core/CL/kernels/CLArgMinMaxLayerKernel.cpp",
-        "src/core/CL/kernels/CLBatchConcatenateLayerKernel.cpp",
         "src/core/CL/kernels/CLBatchNormalizationLayerKernel.cpp",
         "src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp",
         "src/core/CL/kernels/CLBitwiseKernel.cpp",
@@ -101,7 +100,6 @@ cc_library_static {
         "src/core/CL/kernels/CLCropKernel.cpp",
         "src/core/CL/kernels/CLDeconvolutionLayerUpsampleKernel.cpp",
         "src/core/CL/kernels/CLDeconvolutionReshapeOutputKernel.cpp",
-        "src/core/CL/kernels/CLDepthConcatenateLayerKernel.cpp",
         "src/core/CL/kernels/CLDepthConvertLayerKernel.cpp",
         "src/core/CL/kernels/CLDepthToSpaceLayerKernel.cpp",
         "src/core/CL/kernels/CLDepthwiseConvolutionLayer3x3NCHWKernel.cpp",
@@ -145,7 +143,6 @@ cc_library_static {
         "src/core/CL/kernels/CLHOGDescriptorKernel.cpp",
         "src/core/CL/kernels/CLHOGDetectorKernel.cpp",
         "src/core/CL/kernels/CLHarrisCornersKernel.cpp",
-        "src/core/CL/kernels/CLHeightConcatenateLayerKernel.cpp",
         "src/core/CL/kernels/CLHistogramKernel.cpp",
         "src/core/CL/kernels/CLIm2ColKernel.cpp",
         "src/core/CL/kernels/CLInstanceNormalizationLayerKernel.cpp",
@@ -197,9 +194,6 @@ cc_library_static {
         "src/core/CL/kernels/CLWarpAffineKernel.cpp",
         "src/core/CL/kernels/CLWarpPerspectiveKernel.cpp",
         "src/core/CL/kernels/CLWeightsReshapeKernel.cpp",
-        "src/core/CL/kernels/CLWidthConcatenate2TensorsKernel.cpp",
-        "src/core/CL/kernels/CLWidthConcatenate4TensorsKernel.cpp",
-        "src/core/CL/kernels/CLWidthConcatenateLayerKernel.cpp",
         "src/core/CL/kernels/CLWinogradFilterTransformKernel.cpp",
         "src/core/CL/kernels/CLWinogradInputTransformKernel.cpp",
         "src/core/CL/kernels/CLWinogradOutputTransformKernel.cpp",
@@ -437,6 +431,12 @@ cc_library_static {
         "src/core/cpu/kernels/add/sve/qsymm16.cpp",
         "src/core/cpu/kernels/floor/NEON/fp16.cpp",
         "src/core/cpu/kernels/floor/NEON/fp32.cpp",
+        "src/core/gpu/cl/kernels/ClBatchConcatenateKernel.cpp",
+        "src/core/gpu/cl/kernels/ClDepthConcatenateKernel.cpp",
+        "src/core/gpu/cl/kernels/ClHeightConcatenateKernel.cpp",
+        "src/core/gpu/cl/kernels/ClWidthConcatenate2TensorsKernel.cpp",
+        "src/core/gpu/cl/kernels/ClWidthConcatenate4TensorsKernel.cpp",
+        "src/core/gpu/cl/kernels/ClWidthConcatenateKernel.cpp",
         "src/core/helpers/SoftmaxHelpers.cpp",
         "src/core/helpers/WindowHelpers.cpp",
         "src/core/utils/ScaleUtils.cpp",
@@ -781,6 +781,7 @@ cc_library_static {
         "src/runtime/cpu/operators/CpuFloor.cpp",
         "src/runtime/cpu/operators/CpuPermute.cpp",
         "src/runtime/cpu/operators/CpuReshape.cpp",
+        "src/runtime/gpu/cl/operators/ClConcatenate.cpp",
         "utils/CommonGraphOptions.cpp",
         "utils/GraphUtils.cpp",
         "utils/Utils.cpp",