commit 1417356bb77327e285db10564bd0da735ac8afeb
author Zingo Andersen <zingo.andersen@arm.com> Wed Oct 27 06:58:19 2021 +0200
committer Zingo Andersen <zingo.andersen@arm.com> Wed Nov 03 16:50:39 2021 +0000
tree 7e64c6b64308353f8388106f9bb4bf01a2ce8f7b
parent de68d7d0c56ec309fe7cf6bd4b7e8aa407a4e985

Make it possible for backends to add include paths in Android

Signed-off-by: Zingo Andersen <zingo.andersen@arm.com>
Change-Id: I1ae9d7e45d5829330daeece3a99ec08938ead143

Android.mk

diff --git a/Android.mk b/Android.mk
index 7137baf..aa82e49 100644
--- a/Android.mk
+++ b/Android.mk
@@ -45,13 +45,15 @@
 LOCAL_ARM_MODE := arm
 LOCAL_PROPRIETARY_MODULE := true
 
-# placeholder to hold all backend source files, common and specific to the backends
+# Placeholder to hold all backend source files and include paths, common and specific to the backends
 ARMNN_BACKEND_SOURCES :=
+ARMNN_BACKEND_INCLUDES :=
 
 #
-# iterate through the backend common and specific include paths, include them into the
+# Iterate through the backend common and specific include paths, include them into the
 # current makefile and append the sources held by the COMMON_SOURCES and BACKEND_SOURCES variable
 # (included from the given makefile) to the ARMNN_BACKEND_SOURCES list
+# and optional include paths set by BACKEND_INCLUDES to the ARMNN_BACKEND_INCLUDES list
 #
 $(foreach mkPath,$(ARMNN_BACKEND_COMMON_MAKEFILE_DIRS),\
         $(eval include $(LOCAL_PATH)/$(mkPath)/common.mk)\
@@ -63,6 +65,10 @@
         $(eval ARMNN_BACKEND_SOURCES := $(ARMNN_BACKEND_SOURCES)\
         $(patsubst %,$(mkPath)/%,$(BACKEND_SOURCES))))
 
+$(foreach mkPath,$(ARMNN_BACKEND_MAKEFILE_DIRS),\
+        $(eval include $(LOCAL_PATH)/$(mkPath)/backend.mk)\
+        $(eval ARMNN_BACKEND_INCLUDES += $(BACKEND_INCLUDES)))
+
 # Mark source files as dependent on Android.mk and backend makefiles
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \
                                  $(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS)
@@ -94,7 +100,8 @@
         $(ARMNN_PROFILING_HEADER_PATH) \
         $(ARMNN_BACKENDS_HEADER_PATH) \
         $(ARMNN_SERIALIZER_HEADER_PATH) \
-        $(ARMNN_DESERIALIZER_HEADER_PATH)
+        $(ARMNN_DESERIALIZER_HEADER_PATH) \
+        $(ARMNN_BACKEND_INCLUDES)
 
 LOCAL_SRC_FILES := \
         $(ARMNN_BACKEND_SOURCES) \