summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-03-11 02:03:39 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-03-11 02:03:39 +0000
commit080f1925d5dff5840a56d7d534709e9504881ad0 (patch)
tree4700223f8e10fb837726d589b98b38425a94c263
parent1d26bd5e4877ffb5a750c3578dd9ae5cdef8e7cb (diff)
parentdbd31b31992f7f1d796e639b6ecc4128957421f2 (diff)
downloadlibtextclassifier-080f1925d5dff5840a56d7d534709e9504881ad0.tar.gz
Snap for 7199033 from dbd31b31992f7f1d796e639b6ecc4128957421f2 to sc-v2-release
Change-Id: Ibc3692577a01ebfed6fd0952d26f6bcb8ad9d8cf
-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 f9f5c88..943458d 100644
--- a/coverage/Android.bp
+++ b/coverage/Android.bp
@@ -17,5 +17,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 871be1e..7528148 100644
--- a/java/tests/instrumentation/Android.bp
+++ b/java/tests/instrumentation/Android.bp
@@ -58,6 +58,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 944acc5..edcc97d 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -244,6 +244,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 903f6c4..cafd8a3 100644
--- a/notification/tests/Android.bp
+++ b/notification/tests/Android.bp
@@ -45,5 +45,7 @@ android_test {
"device-tests", "mts-extservices"
],
+ min_sdk_version: "30",
+
instrumentation_for: "TextClassifierNotificationLib",
}