diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:53:22 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:22 +0000 |
| commit | 76311fb7beedcd027ef794eecf094f4623894d93 (patch) | |
| tree | e1c68879acac34202a1238acccc9110345eaa56c | |
| parent | 6b511124eb0fd1fdee83d25be9b5a1d10a31abe0 (diff) | |
| parent | 376f6d661729d63d9d17a022a4bd693b33267498 (diff) | |
| download | tensorflow-android-s-v2-preview-1.tar.gz | |
Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Bug: 202323961
Merged-In: I44c29c231f1ec7c6df5b7443e99486e2fa47fa0e
Change-Id: I914bf533b92877bc07d84238e03aa6fb698ba06f
| -rw-r--r-- | tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc | 14 | ||||
| -rw-r--r-- | tensorflow/lite/tflite_static.bp | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc index de107b665fb..deb1d2601e8 100644 --- a/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc +++ b/tensorflow/lite/delegates/nnapi/nnapi_delegate_test.cc @@ -26,20 +26,6 @@ limitations under the License. #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 f8a7db631ad..178f6778ab3 100644 --- a/tensorflow/lite/tflite_static.bp +++ b/tensorflow/lite/tflite_static.bp @@ -18,6 +18,7 @@ cc_library_static { host_supported: true, vendor_available: true, sdk_version: "current", + min_sdk_version: "30", rtti: true, srcs: [ "allocation.cc", |