diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2022-05-20 17:18:50 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2022-05-26 16:19:48 +0100 |
| commit | a3ba4bef6edfbc5203c0476e20524fc83142a4d4 (patch) | |
| tree | cfc5d74c7b53d38a5bbbfd004ed1400cc8e393ef /Android.mk | |
| parent | 3fe3a54c3071dabcbbe2bb44da1aa5a920e6e1f7 (diff) | |
| download | android-nn-driver-a3ba4bef6edfbc5203c0476e20524fc83142a4d4.tar.gz | |
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 <mike.kelly@arm.com>
Change-Id: I62f3be6ebfc7fbef39597295dca194d70294646c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -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) \ |