From a3ba4bef6edfbc5203c0476e20524fc83142a4d4 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 20 May 2022 17:18:50 +0100 Subject: GitHub #644 fails to build with flatbuffers 2.0.6 * Fixed bug where flatbuffers was downloaded every time setup.sh was run. * setup.sh will attempt to use the version of flatbuffers used by android if one is available. * setup.sh will now generate ArmnnSchema_generated.h where one does not exist !armnn:7625 Signed-off-by: Mike Kelly Change-Id: I62f3be6ebfc7fbef39597295dca194d70294646c --- Android.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index cab4a45f..585d8357 100644 --- a/Android.mk +++ b/Android.mk @@ -68,6 +68,7 @@ CPP_VERSION := c++17 endif # Configure these paths if you move the source or Khronos headers +ARMNN_GENERATED_HEADER_PATH := $(LOCAL_PATH)/armnn/generated 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 @@ -77,7 +78,6 @@ ARMNN_BACKEND_MAKEFILE_PATHS := $(subst $(LOCAL_PATH),,$(ARMNN_BACKEND_MAKEFILE_ ARMNN_BACKEND_MAKEFILE_DIRS := $(subst /backend.mk,,$(ARMNN_BACKEND_MAKEFILE_PATHS)) ARMNN_THIRD_PARTY_PATH := $(LOCAL_PATH)/armnn/third-party ARMNN_UTILS_HEADER_PATH := $(LOCAL_PATH)/armnn/src/armnnUtils -ARMNN_THIRD_PARTY_PATH := $(LOCAL_PATH)/armnn/third-party OPENCL_HEADER_PATH := $(LOCAL_PATH)/clframework/include NN_HEADER_PATH := $(LOCAL_PATH)/../../../frameworks/ml/nn/runtime/include ifeq ($(S_OR_LATER),1) @@ -152,6 +152,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -285,6 +286,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -414,6 +416,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -543,6 +546,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -678,6 +682,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -784,6 +789,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -882,6 +888,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ @@ -976,6 +983,7 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_THIRD_PARTY_PATH) \ $(ARMNN_PROFILING_HEADER_PATH) \ $(ARMNN_COMMON_PROFILING_HEADER_PATH) \ -- cgit v1.2.1