Snap for 7406169 from 5be296072af7fe3eaafd51dd5baeb29e1ee0736d to sc-release
Change-Id: If677afc5ee83f72815f4c4b82f50c8b3b69f966b
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ac3e735..93ea6d6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -17,5 +17,19 @@
{
"name": "TextClassifierNotificationTests"
}
+ ],
+ "mainline-presubmit": [
+ {
+ "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
+ },
+ {
+ "name": "TextClassifierServiceTest[com.google.android.extservices.apex]"
+ },
+ {
+ "name": "libtextclassifier_tests[com.google.android.extservices.apex]"
+ },
+ {
+ "name": "libtextclassifier_java_tests[com.google.android.extservices.apex]"
+ }
]
}
\ No newline at end of file
diff --git a/java/tests/instrumentation/Android.bp b/java/tests/instrumentation/Android.bp
index 7528148..74261c1 100644
--- a/java/tests/instrumentation/Android.bp
+++ b/java/tests/instrumentation/Android.bp
@@ -54,7 +54,7 @@
],
test_suites: [
- "device-tests", "mts-extservices"
+ "general-tests", "mts-extservices"
],
plugins: ["androidx.room_room-compiler-plugin",],
diff --git a/java/tests/instrumentation/AndroidTest.xml b/java/tests/instrumentation/AndroidTest.xml
index 48a3f09..6c47a1a 100644
--- a/java/tests/instrumentation/AndroidTest.xml
+++ b/java/tests/instrumentation/AndroidTest.xml
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- This test config file is auto-generated. -->
<configuration description="Runs TextClassifierServiceTest.">
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-instrumentation" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/native/Android.bp b/native/Android.bp
index 782c1de..32a58c3 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -194,7 +194,7 @@
name: "libtextclassifier_tests",
defaults: ["libtextclassifier_defaults"],
- test_suites: ["device-tests", "mts-extservices"],
+ test_suites: ["general-tests", "mts-extservices"],
data: [
"**/test_data/*",
@@ -251,7 +251,7 @@
srcs: ["testing/JvmTestLauncher.java"],
min_sdk_version: "30",
test_suites: [
- "device-tests",
+ "general-tests",
"mts-extservices",
],
static_libs: [
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index b3c012b..11893f5 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config for libtextclassifier_tests">
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="mts" />
diff --git a/notification/tests/Android.bp b/notification/tests/Android.bp
index cafd8a3..48c6324 100644
--- a/notification/tests/Android.bp
+++ b/notification/tests/Android.bp
@@ -42,7 +42,7 @@
],
test_suites: [
- "device-tests", "mts-extservices"
+ "general-tests", "mts-extservices"
],
min_sdk_version: "30",
diff --git a/notification/tests/AndroidTest.xml b/notification/tests/AndroidTest.xml
index 1890e75..0f60d10 100644
--- a/notification/tests/AndroidTest.xml
+++ b/notification/tests/AndroidTest.xml
@@ -13,8 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- This test config file is auto-generated. -->
<configuration description="Runs TextClassifierNotificationTests.">
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
<option name="test-suite-tag" value="apct" />
<option name="test-suite-tag" value="apct-instrumentation" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
