commit 0c8cb99db6dd8b1ea073ef7227b2872a3cb0b269
author Finn Williams <Finn.Williams@arm.com> Thu May 07 10:38:15 2020 +0100
committer Jim Flynn <jim.flynn@arm.com> Tue May 12 22:00:17 2020 +0000
tree 3a2301175e09d7e6f2f5feb2d8c6f8a184493b4c
parent d6cb30e7052891996efa41f608fffe4fa62d2094

IVGCVSW-4731 Move Packet.hpp to profiling/common/include

 * Refactor profiling cmake to fix inconsistencies/issues with includes

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02

Android.mk

diff --git a/Android.mk b/Android.mk
index 99b1694..c9254c7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,7 @@
 NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include
 ARMNN_HEADER_PATH := $(LOCAL_PATH)/include
 ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling
+ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include
 ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder
 ARMNN_MAIN_HEADER_PATH := $(LOCAL_PATH)/src
 ARMNN_SOURCE_HEADER_PATH := $(LOCAL_PATH)/src/armnn
@@ -67,6 +68,7 @@
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
         $(ARMNN_PROFILING_HEADER_PATH) \
@@ -77,6 +79,7 @@
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \
@@ -305,6 +308,7 @@
         $(NN_HEADER_PATH) \
         $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
         $(ARMNN_SOURCE_HEADER_PATH) \