From 2ff430fa807533d2fd973c673d42729005c5b286 Mon Sep 17 00:00:00 2001
From: Ilya Lavrenov <ilya.lavrenov@intel.com>
Date: Thu, 8 Jun 2023 21:22:33 +0400
Subject: [PATCH] Try to use system flatbuffers on Android (#17954)

---
 .ci/azure/android_arm64.yml | 1 +
 cmake/features.cmake        | 2 +-
 vcpkg.json                  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.ci/azure/android_arm64.yml b/.ci/azure/android_arm64.yml
index f9c11638a81..5e53ab311aa 100644
--- a/.ci/azure/android_arm64.yml
+++ b/.ci/azure/android_arm64.yml
@@ -165,6 +165,7 @@ jobs:
         -DENABLE_SYSTEM_PUGIXML=ON
         -DENABLE_SYSTEM_SNAPPY=ON
         -DENABLE_SYSTEM_TBB=ON
+        -DENABLE_SYSTEM_FLATBUFFERS=ON
         -DENABLE_INTEL_GPU=ON
         -DENABLE_TESTS=ON
         -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
diff --git a/cmake/features.cmake b/cmake/features.cmake
index f372abe1a1b..2946c38eb72 100644
--- a/cmake/features.cmake
+++ b/cmake/features.cmake
@@ -164,7 +164,7 @@ ie_dependent_option (ENABLE_SYSTEM_TBB  "Enables use of system TBB" ${ENABLE_SYS
 ie_option (ENABLE_SYSTEM_PUGIXML "Enables use of system PugiXML" ${ENABLE_SYSTEM_PUGIXML_DEFAULT})
 # the option is on by default, because we use only flatc compiler and don't use any libraries
 ie_dependent_option(ENABLE_SYSTEM_FLATBUFFERS "Enables use of system flatbuffers" ON
-    "ENABLE_OV_TF_LITE_FRONTEND;NOT ANDROID" OFF)
+    "ENABLE_OV_TF_LITE_FRONTEND" OFF)
 ie_dependent_option (ENABLE_SYSTEM_OPENCL "Enables use of system OpenCL" ${ENABLE_SYSTEM_LIBS_DEFAULT}
     "ENABLE_INTEL_GPU" OFF)
 # the option is turned off by default, because we compile our own static version of protobuf
diff --git a/vcpkg.json b/vcpkg.json
index 2e777b6fb12..c59dc50c251 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -25,7 +25,7 @@
         {
             "name": "tbb",
             "platform": "static | osx",
-            "version>=": "2021.9.0#1"
+            "version>=": "2021.9.0#2"
         },
         {
             "name": "tbb",
@@ -34,7 +34,7 @@
             ],
             "$TODO": "Remove condition for static once static tbbbind can work in oneTBB",
             "platform": "!static & !osx",
-            "version>=": "2021.9.0#1"
+            "version>=": "2021.9.0#2"
         },
         {
             "name": "xbyak",