Merge branch 'patch/xnnpack-bazel-build-fix' into 'dev'

Fix inclusion of xnnpack delegate in bazel build

See merge request arm-research/smarter/armnn_tflite_backend!26

Author: jishminor

CMakeLists.txt

@@ -144,13 +144,13 @@ if (TFLITE_BAZEL_BUILD)
   endif()
 
   if (TFLITE_ENABLE_XNNPACK)
-    LIST(APPEND BAZEL_BUILD_FLAGS "--define=tflite_with_xnnpack=true")
+    SET(BAZEL_BUILD_PATCH "${CMAKE_CURRENT_SOURCE_DIR}/patches/tflite_bazel_build_with_xnnpack.patch")
   else()
-    LIST(APPEND BAZEL_BUILD_FLAGS "--define=tflite_with_xnnpack=false")
+    SET(BAZEL_BUILD_PATCH "${CMAKE_CURRENT_SOURCE_DIR}/patches/tflite_bazel_build.patch")
   endif()
 
   if (TFLITE_ENABLE_FLEX_OPS)
-    SET(TFLITE_PATCH_COMMAND "git" "apply" "${CMAKE_CURRENT_SOURCE_DIR}/patches/tflite_bazel_build.patch" "||" "true")
+    SET(TFLITE_PATCH_COMMAND "git" "apply" ${BAZEL_BUILD_PATCH} "||" "true")
   else()
     SET(TFLITE_PATCH_COMMAND "")
   endif()

patches/tflite_bazel_build_with_xnnpack.patch

@@ -0,0 +1,13 @@
+diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD
+index 597f81194cd..788decaec74 100644
+--- a/tensorflow/lite/BUILD
++++ b/tensorflow/lite/BUILD
+@@ -775,6 +775,8 @@ tflite_cc_shared_object(
+         ":tflite_exported_symbols.lds",
+         ":tflite_version_script.lds",
+         "//tensorflow/lite/kernels:builtin_ops_all_linked",
++        "//tensorflow/lite/delegates/flex:delegate",
++        "//tensorflow/lite/delegates/xnnpack:xnnpack_delegate",
+     ],
+ )
+