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

[platform/upstream/armnn.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index cf5566f..ee24312 100644 (file)
--- 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 \