commit f74937eca3eece3ccd439933306ac0f32415390e
author Mike Kelly <mike.kelly@arm.com> Fri May 20 17:18:59 2022 +0100
committer Mike Kelly <mike.kelly@arm.com> Thu May 26 16:19:09 2022 +0100
tree 39cc39c78f77f2b10c90ae8d583d9952175e57dc
parent 5ee069ef6c4e7002ddc19ade8a1fbca7ba027d68

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 <mike.kelly@arm.com>
Change-Id: I13ff6b6c78740cf1f82750f56caab83200e6a3e5
Signed-off-by: Mike Kelly <mike.kelly@arm.com>

Android.mk

diff --git a/Android.mk b/Android.mk
index 0dd593a..7f6cb7a 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_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_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) \