Merge Android 12
Bug: 202323961
Merged-In: I44c29c231f1ec7c6df5b7443e99486e2fa47fa0e
Change-Id: I914bf533b92877bc07d84238e03aa6fb698ba06f
diff --git a/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc
index de107b6..deb1d26 100644
--- a/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc
+++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc
@@ -26,20 +26,6 @@
#include "tensorflow/lite/nnapi/NeuralNetworksTypes.h"
#include "tensorflow/lite/nnapi/nnapi_implementation.h"
-namespace testing {
-namespace internal {
-
-// The CTS test fails to compile without this.
-// TODO(b/130342510): Find a proper solution.
-std::string FormatMatcherDescription(bool unused_negation,
- const char* matcher_name,
- const Strings& unused_param_values) {
- return matcher_name;
-}
-
-} // namespace internal
-} // namespace testing
-
namespace tflite {
namespace {
diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp
index f8a7db6..178f677 100644
--- a/tensorflow/lite/tflite_static.bp
+++ b/tensorflow/lite/tflite_static.bp
@@ -18,6 +18,7 @@
host_supported: true,
vendor_available: true,
sdk_version: "current",
+ min_sdk_version: "30",
rtti: true,
srcs: [
"allocation.cc",
