From a097d2a0ed8e30d5aaf6d29ec18d0c39201b7b67 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Wed, 24 Nov 2021 15:47:28 +0000
Subject: IVGCVSW-6453 'Move the ArmNN Test Utils code to a physically separate
 directory'

* Created include/armnnTestUtils directory
* Moved Arm NN test utils files into armnnTestUtils directory

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I03ac54c645c41c52650c4c03b6a58fb1481fef5d
---
 Android.mk | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index c3cb155731..fc5900be0c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,7 @@ ARMNN_THIRD_PARTY_INCLUDE_PATH := $(LOCAL_PATH)/third-party
 ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src
 ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
 ARMNN_SOURCE_UTILS_HEADER_PATH := $(LOCAL_PATH)/src/armnnUtils
+ARMNN_TEST_UTILS_SOURCE_PATH := $(LOCAL_PATH)/src/armnnTestUtils
 ARMNN_BACKENDS_HEADER_PATH := $(LOCAL_PATH)/src/backends
 ARMNN_PROFILING_HEADER_PATH := $(LOCAL_PATH)/src/profiling
 ARMNN_SERIALIZER_HEADER_PATH := $(LOCAL_PATH)/src/armnnSerializer
@@ -347,6 +348,7 @@ LOCAL_C_INCLUDES := \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
+        $(ARMNN_TEST_UTILS_SOURCE_PATH) \
         $(ARMNN_PROFILING_HEADER_PATH) \
         $(ARMNN_BACKENDS_HEADER_PATH) \
         $(ARMNN_SERIALIZER_HEADER_PATH) \
@@ -382,7 +384,6 @@ LOCAL_SRC_FILES := \
         src/armnn/test/FloatingPointConverterTest.cpp \
         src/armnn/test/FlowControl.cpp \
         src/armnn/test/GraphTests.cpp \
-        src/armnn/test/GraphUtils.cpp \
         src/armnn/test/InferOutputTests.cpp \
         src/armnn/test/InstrumentTests.cpp \
         src/armnnUtils/ModelAccuracyChecker.cpp \
@@ -419,12 +420,15 @@ LOCAL_SRC_FILES := \
         src/armnn/test/TestLayerVisitor.cpp \
         src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp \
         src/armnn/test/TestNameOnlyLayerVisitor.cpp \
-        src/armnn/test/TestUtils.cpp \
-        src/armnn/test/UnitTests.cpp \
         src/armnn/test/UtilsTests.cpp \
         src/armnnUtils/test/ParserHelperTest.cpp \
         src/armnnUtils/test/QuantizeHelperTest.cpp \
         src/armnnUtils/test/TensorUtilsTest.cpp \
+        src/armnnTestUtils/CommonTestUtils.cpp \
+        src/armnnTestUtils/GraphUtils.cpp \
+        src/armnnTestUtils/TensorCopyUtils.cpp \
+        src/armnnTestUtils/TestUtils.cpp \
+        src/armnnTestUtils/UnitTests.cpp \
         src/profiling/test/BufferTests.cpp \
         src/profiling/test/FileOnlyProfilingDecoratorTests.cpp \
         src/profiling/test/PrintPacketHeaderHandler.cpp \
-- 
cgit v1.2.1