From f74937eca3eece3ccd439933306ac0f32415390e Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Fri, 20 May 2022 17:18:59 +0100 Subject: GitHub #644 fails to build with flatbuffers 2.0.6 * Removed the pre-generated ArmnnSchema_generated.h * This version was generated using flatbuffers v1.12.0 and it contains code that's incompatible with newer versions * Android.mk will look for ArmnnSchema_generated.h in the armnnGenerated directory in the armnn directory. * The Serializer and Deserializer will look for ArmnnSchema_generated.h in the armnnGenerated directory. !android-nn-driver:7626 Signed-off-by: Mike Kelly Change-Id: I13ff6b6c78740cf1f82750f56caab83200e6a3e5 Signed-off-by: Mike Kelly --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0dd593ada0..7f6cb7abea 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,7 @@ LOCAL_PATH := $(call my-dir) # Configure these paths if you move the source or Khronos headers +ARMNN_GENERATED_HEADER_PATH := $(LOCAL_PATH)/generated OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/include @@ -92,6 +93,7 @@ LOCAL_EXPORT_C_INCLUDES := \ LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_PROFILING_INCLUDE_PATH) \ $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \ $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \ @@ -373,6 +375,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) \ + $(ARMNN_GENERATED_HEADER_PATH) \ $(ARMNN_PROFILING_INCLUDE_PATH) \ $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \ $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \ -- cgit v1.2.1