1 files changed, 13 insertions, 20 deletions
diff --git a/Android.bp b/Android.bp
index ccf513a137..fd6ff3b4d3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -178,8 +178,8 @@ cc_library_static {
     proprietary: true,
     local_include_dirs: ["build/android-arm64v8a/src/core",
                          "build/android-arm64v8a/src/core/CL",
-                         "compute_kernel_writer/include",
-                         "compute_kernel_writer",
+                         "compute_kernel_writer/prototype/include",
+                         "compute_kernel_writer/prototype",
                          "src/core/common",
                          "src/core/helpers",
                          "src/core/NEON/kernels/arm_gemm",
@@ -189,24 +189,14 @@ cc_library_static {
                          "src/cpu/kernels/assembly"],
     export_include_dirs: [".", "./include"],
     srcs: [
-        "compute_kernel_writer/src/Error.cpp",
-        "compute_kernel_writer/src/Helpers.cpp",
-        "compute_kernel_writer/src/Kernel.cpp",
-        "compute_kernel_writer/src/KernelWriter.cpp",
-        "compute_kernel_writer/src/OperandBase.cpp",
-        "compute_kernel_writer/src/TensorInfo.cpp",
-        "compute_kernel_writer/src/TensorOperand.cpp",
-        "compute_kernel_writer/src/TensorTileSampler.cpp",
-        "compute_kernel_writer/src/TensorUtils.cpp",
-        "compute_kernel_writer/src/TileInfo.cpp",
-        "compute_kernel_writer/src/TileOperand.cpp",
-        "compute_kernel_writer/src/acl/AclComponentArgument.cpp",
-        "compute_kernel_writer/src/acl/AclKernelWriter.cpp",
-        "compute_kernel_writer/src/acl/AclScopedKernelWriter.cpp",
-        "compute_kernel_writer/src/cl/CLConstantTile.cpp",
-        "compute_kernel_writer/src/cl/CLHelpers.cpp",
-        "compute_kernel_writer/src/cl/CLTile.cpp",
-        "compute_kernel_writer/src/cl/ICLTile.cpp",
+        "compute_kernel_writer/prototype/src/Kernel.cpp",
+        "compute_kernel_writer/prototype/src/KernelWriter.cpp",
+        "compute_kernel_writer/prototype/src/OperandBase.cpp",
+        "compute_kernel_writer/prototype/src/TensorInfo.cpp",
+        "compute_kernel_writer/prototype/src/TensorOperand.cpp",
+        "compute_kernel_writer/prototype/src/TensorTileSampler.cpp",
+        "compute_kernel_writer/prototype/src/TileInfo.cpp",
+        "compute_kernel_writer/prototype/src/TileOperand.cpp",
         "src/c/AclContext.cpp",
         "src/c/AclOperator.cpp",
         "src/c/AclQueue.cpp",
@@ -642,7 +632,10 @@ cc_library_static {
         "src/dynamic_fusion/sketch/gpu/GpuOperatorGroup.cpp",
         "src/dynamic_fusion/sketch/gpu/GpuWorkloadContext.cpp",
         "src/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.cpp",
+        "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwComponentArgument.cpp",
         "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwDriver.cpp",
+        "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwKernelWriter.cpp",
+        "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwScopedKernelWriter.cpp",
         "src/dynamic_fusion/sketch/gpu/ckw_driver/GpuCkwVariableTable.cpp",
         "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwElementwiseBinary.cpp",
         "src/dynamic_fusion/sketch/gpu/ckw_driver/components/GpuCkwStore.cpp",