commit a3ba4bef6edfbc5203c0476e20524fc83142a4d4
author Mike Kelly <mike.kelly@arm.com> Fri May 20 17:18:50 2022 +0100
committer Mike Kelly <mike.kelly@arm.com> Thu May 26 16:19:48 2022 +0100
tree cfc5d74c7b53d38a5bbbfd004ed1400cc8e393ef
parent 3fe3a54c3071dabcbbe2bb44da1aa5a920e6e1f7

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

Android.bp

diff --git a/Android.bp b/Android.bp
index b8826cb..f7cdadc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,10 +11,10 @@
 cc_defaults {
     name: "libflatbuffers-defaults",
     proprietary: true,
-    export_include_dirs: [ "flatbuffers-1.12.0/",
-                           "flatbuffers-1.12.0/include",
+    export_include_dirs: [ "flatbuffers/",
+                           "flatbuffers/include",
     ],
-    local_include_dirs: ["flatbuffers-1.12.0/include",],
+    local_include_dirs: ["flatbuffers/include",],
     cflags: [
         "-O3",
         "-fexceptions",
@@ -31,8 +31,8 @@
     name: "libflatbuffers-framework",
     defaults: ["libflatbuffers-defaults"],
     srcs: [
-        "flatbuffers-1.12.0/src/flatc.cpp",
-        "flatbuffers-1.12.0/src/flatc_main.cpp",
+        "flatbuffers/src/flatc.cpp",
+        "flatbuffers/src/flatc_main.cpp",
     ],
 }