IVGCVSW-1946: Remove armnn/src from the include paths
Change-Id: I663a0a0fccb43ee960ec070121a59df9db0bb04e
diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt
index 4378276..637b724 100644
--- a/src/backends/aclCommon/test/CMakeLists.txt
+++ b/src/backends/aclCommon/test/CMakeLists.txt
@@ -10,6 +10,6 @@
)
add_library(armnnAclCommonUnitTests OBJECT ${armnnAclCommonUnitTests_sources})
-target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src)
target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
+target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
diff --git a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
index a79cfe6..ec2072d 100644
--- a/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
+++ b/src/backends/aclCommon/test/CreateWorkloadClNeon.hpp
@@ -4,17 +4,17 @@
//
#pragma once
-#include <armnn/test/CreateWorkload.hpp>
+#include <test/CreateWorkload.hpp>
-#include <backends/MemCopyWorkload.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
+#include <backendsCommon/MemCopyWorkload.hpp>
+#include <reference/RefWorkloadFactory.hpp>
#if ARMCOMPUTECL_ENABLED
-#include <backends/cl/ClTensorHandle.hpp>
+#include <cl/ClTensorHandle.hpp>
#endif
#if ARMCOMPUTENEON_ENABLED
-#include <backends/neon/NeonTensorHandle.hpp>
+#include <neon/NeonTensorHandle.hpp>
#endif
using namespace armnn;
diff --git a/src/backends/aclCommon/test/MemCopyTestImpl.hpp b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
index 322cb07..6cafaad 100644
--- a/src/backends/aclCommon/test/MemCopyTestImpl.hpp
+++ b/src/backends/aclCommon/test/MemCopyTestImpl.hpp
@@ -4,11 +4,11 @@
//
#pragma once
-#include <backends/test/LayerTests.hpp>
-#include <backends/test/TensorCopyUtils.hpp>
-#include <backends/test/WorkloadTestUtils.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
+#include <backendsCommon/test/TensorCopyUtils.hpp>
+#include <backendsCommon/test/WorkloadTestUtils.hpp>
-#include <armnn/test/TensorHelpers.hpp>
+#include <test/TensorHelpers.hpp>
#include <boost/multi_array.hpp>
diff --git a/src/backends/aclCommon/test/MemCopyTests.cpp b/src/backends/aclCommon/test/MemCopyTests.cpp
index d8b407d..3d4236d 100644
--- a/src/backends/aclCommon/test/MemCopyTests.cpp
+++ b/src/backends/aclCommon/test/MemCopyTests.cpp
@@ -3,13 +3,13 @@
// SPDX-License-Identifier: MIT
//
-#include <backends/aclCommon/ArmComputeTensorUtils.hpp>
-#include <backends/cl/ClWorkloadFactory.hpp>
-#include <backends/neon/NeonWorkloadFactory.hpp>
+#include <aclCommon/ArmComputeTensorUtils.hpp>
+#include <cl/ClWorkloadFactory.hpp>
+#include <neon/NeonWorkloadFactory.hpp>
#if ARMCOMPUTECL_ENABLED && ARMCOMPUTENEON_ENABLED
-#include <backends/aclCommon/test/MemCopyTestImpl.hpp>
-#include <backends/cl/test/ClContextControlFixture.hpp>
+#include <aclCommon/test/MemCopyTestImpl.hpp>
+#include <cl/test/ClContextControlFixture.hpp>
#endif
#include <boost/test/unit_test.hpp>