commit 15fb933ce48484e29a563e195eca0442d0366457
author Matthew Bentham <matthew.bentham@arm.com> Tue Jan 22 13:09:12 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Jan 23 12:02:10 2019 +0000
tree f85748dc2bbfa40a94ed045270bc953d54099029
parent 074f1ec6063a692ffacd8f0c0d132216a98ae509

IVGCVSW-2545 Fix android-nn-driver build wrt master Compute Library

Change-Id: I09b976c6323194ae39a2ce7131be5a407487b863

Android.bp

diff --git a/Android.bp b/Android.bp
index 90da25b..e53cf8b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -161,11 +161,9 @@
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_int8.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint16.cpp",
         "clframework/src/core/NEON/kernels/arm_gemm/gemm_uint8.cpp",
+        "clframework/src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_nativeA_pretransposeB_16x4/generic.cpp",
         "clframework/src/core/NEON/kernels/assembly/Helpers.cpp",
         "clframework/src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.cpp",
-        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedMatrixMultiplyWrapper.cpp",
-        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedPrepareBWrapperKernel.cpp",
-        "clframework/src/core/NEON/kernels/assembly/NEGEMMInterleavedTransformAWrapper.cpp",
         "clframework/src/core/NEON/kernels/assembly/NEGEMMNativeWrapperKernel.cpp",
         "clframework/src/core/NEON/kernels/convolution/common/utils.cpp",
         "clframework/src/core/NEON/kernels/convolution/depthwise/depthwise_2x2_3x3_1x1_fp32_fp32.cpp",
@@ -421,6 +419,7 @@
         "clframework/src/runtime/CL/functions/CLWinogradConvolutionLayer.cpp",
         "clframework/src/runtime/CL/functions/CLWinogradInputTransform.cpp",
         "clframework/src/runtime/CL/functions/CLYOLOLayer.cpp",
+        "clframework/src/runtime/CL/gemm_reshaped/CLGEMMReshapedConfigurationBifrost.cpp",
         "clframework/src/runtime/CL/ICLSimpleFunction.cpp",
         "clframework/src/runtime/CL/tuners/BifrostTuner.cpp",
         "clframework/src/runtime/CL/tuners/MidgardTuner.cpp",