1 files changed, 14 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index f542b20104..78ac7f130f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,6 +52,7 @@ cc_library_static {
     export_include_dirs: [".", "./include"],
     srcs: [
         "src/c/AclContext.cpp",
+        "src/c/AclQueue.cpp",
         "src/c/AclTensor.cpp",
         "src/c/AclTensorPack.cpp",
         "src/c/AclVersion.cpp",
@@ -300,7 +301,7 @@ cc_library_static {
         "src/core/cpu/kernels/CpuDepthwiseConvolutionNativeKernel.cpp",
         "src/core/cpu/kernels/CpuDequantizationKernel.cpp",
         "src/core/cpu/kernels/CpuDirectConvolutionKernel.cpp",
-        "src/core/cpu/kernels/CpuDirectConvolutionStageKernel.cpp",
+        "src/core/cpu/kernels/CpuDirectConvolutionOutputStageKernel.cpp",
         "src/core/cpu/kernels/CpuElementwiseKernel.cpp",
         "src/core/cpu/kernels/CpuElementwiseUnaryKernel.cpp",
         "src/core/cpu/kernels/CpuFillKernel.cpp",
@@ -315,16 +316,16 @@ cc_library_static {
         "src/core/cpu/kernels/CpuSoftmaxKernel.cpp",
         "src/core/cpu/kernels/CpuSubKernel.cpp",
         "src/core/cpu/kernels/CpuTransposeKernel.cpp",
-        "src/core/cpu/kernels/activation/NEON/fp16.cpp",
-        "src/core/cpu/kernels/activation/NEON/fp32.cpp",
-        "src/core/cpu/kernels/activation/NEON/qasymm8.cpp",
-        "src/core/cpu/kernels/activation/NEON/qasymm8_signed.cpp",
-        "src/core/cpu/kernels/activation/NEON/qsymm16.cpp",
-        "src/core/cpu/kernels/activation/SVE/fp16.cpp",
-        "src/core/cpu/kernels/activation/SVE/fp32.cpp",
-        "src/core/cpu/kernels/activation/SVE/qasymm8.cpp",
-        "src/core/cpu/kernels/activation/SVE/qasymm8_signed.cpp",
-        "src/core/cpu/kernels/activation/SVE/qsymm16.cpp",
+        "src/core/cpu/kernels/activation/neon/fp16.cpp",
+        "src/core/cpu/kernels/activation/neon/fp32.cpp",
+        "src/core/cpu/kernels/activation/neon/qasymm8.cpp",
+        "src/core/cpu/kernels/activation/neon/qasymm8_signed.cpp",
+        "src/core/cpu/kernels/activation/neon/qsymm16.cpp",
+        "src/core/cpu/kernels/activation/sve/fp16.cpp",
+        "src/core/cpu/kernels/activation/sve/fp32.cpp",
+        "src/core/cpu/kernels/activation/sve/qasymm8.cpp",
+        "src/core/cpu/kernels/activation/sve/qasymm8_signed.cpp",
+        "src/core/cpu/kernels/activation/sve/qsymm16.cpp",
         "src/core/cpu/kernels/add/neon/integer.cpp",
         "src/core/cpu/kernels/add/neon/qasymm8.cpp",
         "src/core/cpu/kernels/add/neon/qasymm8_signed.cpp",
@@ -390,8 +391,10 @@ cc_library_static {
         "src/core/utils/misc/MMappedFile.cpp",
         "src/core/utils/quantization/AsymmHelpers.cpp",
         "src/cpu/CpuContext.cpp",
+        "src/cpu/CpuQueue.cpp",
         "src/cpu/CpuTensor.cpp",
         "src/gpu/cl/ClContext.cpp",
+        "src/gpu/cl/ClQueue.cpp",
         "src/gpu/cl/ClTensor.cpp",
         "src/runtime/Allocator.cpp",
         "src/runtime/BlobLifetimeManager.cpp",