From c9cc80455ff29fd2c8622c9487ec9c57ade6ea30 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Thu, 1 Nov 2018 16:15:57 +0000 Subject: IVGCVSW-1946: Remove armnn/src from the include paths Change-Id: I663a0a0fccb43ee960ec070121a59df9db0bb04e --- Android.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index cf5566fa96..ee24312156 100644 --- a/Android.mk +++ b/Android.mk @@ -13,10 +13,10 @@ ARMNN_HEADER_PATH := $(LOCAL_PATH)/include 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_BACKENDS_HEADER_PATH := $(LOCAL_PATH)/src/backends # find the common.mk and backend.mk files in the backend source folders -ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/common.mk) \ - $(LOCAL_PATH)/src/backends/common.mk +ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS := $(wildcard $(LOCAL_PATH)/src/backends/*/common.mk) ARMNN_BACKEND_COMMON_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_COMMON_MAKEFILE_LOCAL_PATHS)) ARMNN_BACKEND_COMMON_MAKEFILE_DIRS := $(subst /common.mk,,$(ARMNN_BACKEND_COMMON_MAKEFILE_PATHS)) @@ -57,7 +57,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \ LOCAL_EXPORT_C_INCLUDES := \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ @@ -65,7 +66,8 @@ LOCAL_C_INCLUDES := \ $(ARMNN_HEADER_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_SRC_FILES := \ $(ARMNN_BACKEND_SOURCES) \ @@ -182,7 +184,8 @@ LOCAL_C_INCLUDES := \ $(ARMNN_HEADER_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ $(ARMNN_SOURCE_HEADER_PATH) \ - $(ARMNN_SOURCE_UTILS_HEADER_PATH) + $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ + $(ARMNN_BACKENDS_HEADER_PATH) LOCAL_CFLAGS := \ -std=c++14 \ -- cgit v1.2.1