commit aa5766a754861c2cdbbb1bfd93d505ffef5c704c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:38:01 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 20:38:01 2022 +0000
tree cd3270a7426f542c4356860c545903482d6507ba
parent 98e68d9e3a9248c8e7a267ce82a0f2d4018d4f23
parent b4211c01d01f446bddf4b350ff577cf854781773

Snap for 8414339 from b4211c01d01f446bddf4b350ff577cf854781773 to tm-qpr1-release

Change-Id: I891120fca49e24df96216145154b5926289904fe

tensorflow/lite/delegates/nnapi/TEST_MAPPING

diff --git a/tensorflow/lite/delegates/nnapi/TEST_MAPPING b/tensorflow/lite/delegates/nnapi/TEST_MAPPING
index e304f92..ca9065e 100644
--- a/tensorflow/lite/delegates/nnapi/TEST_MAPPING
+++ b/tensorflow/lite/delegates/nnapi/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "CtsTfliteNnapiDelegateTestCases"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "CtsTfliteNnapiDelegateTestCases"
+    }
   ]
 }

tensorflow/lite/java/Android.bp

diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp
index 833c3b0..6c2bb6a 100644
--- a/tensorflow/lite/java/Android.bp
+++ b/tensorflow/lite/java/Android.bp
@@ -24,6 +24,7 @@
 java_library_static {
     name: "tensorflowlite_java",
     sdk_version: "current",
+    min_sdk_version: "30",
     libs: [
         "android-support-annotations",
         "guava-android-annotation-stubs",
@@ -39,6 +40,7 @@
 cc_library_shared {
     name: "libtensorflowlite_jni",
     sdk_version: "current",
+    min_sdk_version: "30",
     export_include_dirs: [
         "src/main/native/",
     ],