summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-04-08 00:27:53 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-04-08 00:27:53 +0000
commit12cb6d30e477c329bfec077fdcb7ad45e0c5514f (patch)
treef195bfc1820af8db8894cfd3bdfdbb68d06f378a
parent3fbfb79b37957f7cfe84a0e7796717b10ee89f83 (diff)
parentcbd86f7d00050a2521bf4ff8135fad98390c1578 (diff)
downloadlibtextclassifier-android11-mainline-networkstack-release.tar.gz
Snap for 7266504 from cbd86f7d00050a2521bf4ff8135fad98390c1578 to mainline-networkstack-releaseandroid-mainline-11.0.0_r41android11-mainline-networkstack-release
Change-Id: I6ef066fd015405f7f5740b8132d8e1d4a5897de5
-rw-r--r--TEST_MAPPING3
-rw-r--r--coverage/Android.bp1
-rw-r--r--java/tests/instrumentation/Android.bp1
-rw-r--r--native/Android.bp1
-rw-r--r--notification/tests/Android.bp2
5 files changed, 8 insertions, 0 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index cbcd136..ac3e735 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -13,6 +13,9 @@
},
{
"name": "libtextclassifier_java_tests"
+ },
+ {
+ "name": "TextClassifierNotificationTests"
}
]
} \ No newline at end of file
diff --git a/coverage/Android.bp b/coverage/Android.bp
index 699c629..42bfb5f 100644
--- a/coverage/Android.bp
+++ b/coverage/Android.bp
@@ -8,5 +8,6 @@ android_library {
"androidx.test.rules",
],
+ min_sdk_version: "30",
sdk_version: "current",
}
diff --git a/java/tests/instrumentation/Android.bp b/java/tests/instrumentation/Android.bp
index 43cb864..a2ce96c 100644
--- a/java/tests/instrumentation/Android.bp
+++ b/java/tests/instrumentation/Android.bp
@@ -49,6 +49,7 @@ android_test {
],
plugins: ["androidx.room_room-compiler-plugin",],
+ min_sdk_version: "30",
sdk_version: "system_current",
use_embedded_native_libs: true,
compile_multilib: "both",
diff --git a/native/Android.bp b/native/Android.bp
index b521c4a..03b0921 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -235,6 +235,7 @@ cc_test_library {
android_test {
name: "libtextclassifier_java_tests",
srcs: ["testing/JvmTestLauncher.java"],
+ min_sdk_version: "30",
test_suites: [
"device-tests",
"mts-extservices",
diff --git a/notification/tests/Android.bp b/notification/tests/Android.bp
index d504496..057830a 100644
--- a/notification/tests/Android.bp
+++ b/notification/tests/Android.bp
@@ -36,5 +36,7 @@ android_test {
"device-tests", "mts-extservices"
],
+ min_sdk_version: "30",
+
instrumentation_for: "TextClassifierNotificationLib",
}