commit c9cc80455ff29fd2c8622c9487ec9c57ade6ea30
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Thu Nov 01 16:15:57 2018 +0000
committer Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Fri Nov 02 14:49:21 2018 +0000
tree 41b1491312fe6082b39d5d37ffa0dcf0ab0f2817
parent 207ef9a6b8b3ea0afe9a095639f67b5dedd095d7

IVGCVSW-1946: Remove armnn/src from the include paths

Change-Id: I663a0a0fccb43ee960ec070121a59df9db0bb04e

Android.mk

diff --git a/Android.mk b/Android.mk
index cf5566f..ee24312 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,10 +13,10 @@
 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_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 @@
 	$(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 @@
 	$(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 \