From 06a4a8b297aa3dc60ca8874b6d067cff1d44cb9d Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Wed, 23 Mar 2022 15:58:46 +0000 Subject: IVGCVSW-6706 Update header includes for new client profiling lib !armnn:7327 Change-Id: If4efc2195eb8713e98767fd4732ae9f4f2bfe09b Signed-off-by: Jim Flynn --- Android.mk | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index 21ef1363..cab4a45f 100644 --- a/Android.mk +++ b/Android.mk @@ -68,6 +68,9 @@ CPP_VERSION := c++17 endif # Configure these paths if you move the source or Khronos headers +ARMNN_PROFILING_HEADER_PATH := $(LOCAL_PATH)/armnn/profiling +ARMNN_COMMON_PROFILING_HEADER_PATH := $(LOCAL_PATH)/armnn/profiling/common/include +ARMNN_CLIENT_PROFILING_HEADER_PATH := $(LOCAL_PATH)/armnn/profiling/client/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/armnn/include ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/armnn/src/backends/*/backend.mk) ARMNN_BACKEND_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS)) @@ -149,10 +152,12 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_UTILS_HEADER_PATH) \ - $(ARMNN_THIRD_PARTY_PATH) \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) @@ -280,10 +285,12 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_UTILS_HEADER_PATH) \ - $(ARMNN_THIRD_PARTY_PATH) \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) @@ -407,10 +414,12 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_UTILS_HEADER_PATH) \ - $(ARMNN_THIRD_PARTY_PATH) \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) @@ -534,10 +543,12 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_UTILS_HEADER_PATH) \ - $(ARMNN_THIRD_PARTY_PATH) \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) @@ -667,8 +678,11 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(NN_HEADER_PATH) LOCAL_CFLAGS := \ @@ -770,8 +784,11 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(NN_HEADER_PATH) LOCAL_CFLAGS := \ @@ -865,8 +882,11 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(NN_HEADER_PATH) LOCAL_CFLAGS := \ @@ -956,8 +976,11 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ + $(ARMNN_PROFILING_HEADER_PATH) \ + $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ + $(ARMNN_CLIENT_PROFILING_HEADER_PATH) \ + $(ARMNN_HEADER_PATH) \ $(NN_HEADER_PATH) LOCAL_CFLAGS := \ -- cgit v1.2.1