commit 277618302d0f131eac0b6ac2015dd3eb09aa6ff9
author Jim Flynn <jim.flynn@arm.com> Sun Mar 20 21:52:17 2022 +0000
committer Jim Flynn <jim.flynn@arm.com> Wed Mar 23 20:32:03 2022 +0000
tree e468fa1362640484b508812596fb5c1b62186882
parent a3bc0b4976395226c0fa0898b26098c4534edbdb

IVGCVSW-6706 Move headers to profiling/client/include

!android-nn-driver:7337

Change-Id: Ide401623829cc99fb9b51e9bbce3482ce706a8dd
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index b0436bd..2d38182 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_CLIENT_INCLUDE_PATH := $(LOCAL_PATH)/profiling/client/include
 ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include
 ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder
 ARMNN_THIRD_PARTY_INCLUDE_PATH := $(LOCAL_PATH)/third-party
@@ -75,10 +76,11 @@
                                  $(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS)
 
 LOCAL_EXPORT_C_INCLUDES := \
-        $(ARMNN_MAIN_HEADER_PATH) \
-        $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
         $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
+        $(ARMNN_MAIN_HEADER_PATH) \
+        $(ARMNN_SOURCE_HEADER_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_SOURCE_UTILS_HEADER_PATH) \
@@ -90,9 +92,10 @@
 LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
-        $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
         $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
+        $(ARMNN_HEADER_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \
@@ -368,9 +371,10 @@
 LOCAL_C_INCLUDES := \
         $(OPENCL_HEADER_PATH) \
         $(NN_HEADER_PATH) \
-        $(ARMNN_HEADER_PATH) \
         $(ARMNN_PROFILING_INCLUDE_PATH) \
         $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \
+        $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \
+        $(ARMNN_HEADER_PATH) \
         $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \
         $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \
         $(ARMNN_MAIN_HEADER_PATH) \