IVGCVSW-2773 Update clframework pin: modified the Android.bp file

!armnn:1032
Change-Id: I5ddbd9ed23495f04dde9a3b0fc2a30a0560da5f2
Signed-off-by: Ruomei Yan <ruomei.yan@arm.com>

1 files changed, 21 insertions, 18 deletions

diff --git a/Android.bp b/Android.bp
index 8168aa4b..3df1c281 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,7 +13,9 @@ cc_library_static {
     proprietary: true,
     local_include_dirs: ["clframework/build/android-arm64v8a/src/core",
                          "clframework/build/android-arm64v8a/src/core/CL",
-                         "clframework/arm_compute/core/NEON/kernels/assembly"],
+                         "clframework/arm_compute/core/NEON/kernels/assembly",
+                         "clframework/arm_compute/core/NEON/kernels/convolution/common",
+                         "clframework/arm_compute/core/NEON/kernels/convolution/winograd"],
     export_include_dirs: ["clframework", "clframework/include"],
     srcs: [
         "clframework/src/core/AccessWindowAutoPadding.cpp",
@@ -195,6 +197,7 @@ cc_library_static {
         "clframework/src/core/NEON/kernels/convolution/common/padding.cpp",
         "clframework/src/core/NEON/kernels/convolution/common/qasymm8.cpp",
         "clframework/src/core/NEON/kernels/convolution/common/utils.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/padding.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_1x1_fp32_fp32.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_2x2_fp32_fp32.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_3x3_3x3_1x1_fp16_fp16.cpp",
@@ -205,23 +208,22 @@ cc_library_static {
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_4x4_3x3_2x2_fp32_fp32.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_pack_parameters.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_qa8_qa8.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/batched_blocked_gemm.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_1x8_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_2x2_3x3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/input_6x6_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2_7_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2x2_3x3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_2x2_5x5_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_4_5_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_4x4_3x3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/output_6_3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2_7_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2x2_3x3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_2x2_5x5_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_4_5_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_4x4_3x3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/transforms/weights_6_3_fp32.cpp",
-        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_gemm.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_1x8_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_4x4_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/input_6x6_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2_7_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2x2_3x3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_2x2_5x5_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_4_5_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_4x4_3x3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/output_6_3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2_7_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2x2_3x3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_2x2_5x5_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4_5_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_4x4_3x3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd_transforms/weights_6_3_fp32_fp32_integers.cpp",
+        "clframework/src/core/NEON/kernels/convolution/winograd/winograd.cpp",
         "clframework/src/core/NEON/kernels/NEAbsoluteDifferenceKernel.cpp",
         "clframework/src/core/NEON/kernels/NEAccumulateKernel.cpp",
         "clframework/src/core/NEON/kernels/NEActivationLayerKernel.cpp",
@@ -489,6 +491,7 @@ cc_library_static {
         "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp",
         "clframework/src/runtime/CL/ICLSimpleFunction.cpp",
         "clframework/src/runtime/CL/tuners/BifrostTuner.cpp",
+        "clframework/src/runtime/CL/tuners/CLLWSList.cpp",
         "clframework/src/runtime/CL/tuners/MidgardTuner.cpp",
         "clframework/src/runtime/CPP/CPPScheduler.cpp",
         "clframework/src/runtime/CPP/functions/CPPBoxWithNonMaximaSuppressionLimit.cpp",