commit 927ee6c459e9675462e393357b0c52f0dc61d598
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 26 15:34:06 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 26 15:34:06 2021 +0000
tree 0f32f6109c5bbffe24b5d466298f8d2409d902b0
parent ce3422bc4d7b1dcb644a21fb8f42efd2d0bb87a5
parent 8d43d5012e0d84cea99f0d542fb25831ae918235

Merge "Add mainline tests to presubmit." into sc-mainline-prod

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index cb7c12c..42b145d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,4 +1,9 @@
 {
+    "mainline-presubmit": [
+        {
+            "name": "MediaProviderTests[com.google.android.mediaprovider.apex]"
+        }
+    ],
     "presubmit": [
         {
             "name": "MediaProviderTests"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 6022db8..2d134fc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -12,7 +12,7 @@
     target_sdk_version: "30",
     min_sdk_version: "30",
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts-mediaprovider",
     ],
 }
@@ -31,7 +31,7 @@
     target_sdk_version: "30",
     min_sdk_version: "30",
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts-mediaprovider",
     ],
 }
@@ -50,7 +50,7 @@
     target_sdk_version: "30",
     min_sdk_version: "30",
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts-mediaprovider",
     ],
 }
@@ -69,7 +69,7 @@
     target_sdk_version: "28",
     min_sdk_version: "30",
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts-mediaprovider",
     ],
 }
@@ -91,7 +91,7 @@
 android_test {
     name: "MediaProviderTests",
     test_suites: [
-        "device-tests",
+        "general-tests",
         "mts-mediaprovider",
     ],
     compile_multilib: "both",

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 7fd80d5..fc561af 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -23,6 +23,11 @@
         <option name="install-arg" value="-g" />
     </target_preparer>
 
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="framework-base-presubmit" />
     <option name="test-tag" value="MediaProviderTests" />