aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Saldivar <jorgesaldivar@google.com>2022-07-20 20:07:50 +0000
committerJorge Saldivar <jorgesaldivar@google.com>2022-07-21 16:34:24 +0000
commitaeff2df88f2b41be4ed557c4236dae6bb4c3fcc0 (patch)
tree54cd1bac7c9597e38bd4bb21433698735cc0b0be
parentc2737262813cd118b2c93d0fe7ae6babfb89dccc (diff)
downloadcbor-java-aeff2df88f2b41be4ed557c4236dae6bb4c3fcc0.tar.gz
Fixes mainline-presubmit for cbor-java
Bug: 239268572 Test: mma Change-Id: I0f6874e1195b3a74baa5db2c22c830f9b6b7bc95
-rw-r--r--Android.bp3
-rw-r--r--AndroidTest.xml3
-rw-r--r--TEST_MAPPING2
3 files changed, 6 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index 3ffcb38..3386f9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,6 +57,9 @@ android_test {
libs: [
"android.test.base",
],
+ test_mainline_modules: [
+ "com.google.android.adservices.apex"
+ ],
min_sdk_version: "30",
sdk_version: "test_current",
test_suites: [
diff --git a/AndroidTest.xml b/AndroidTest.xml
index 0f077ff..824c8b3 100644
--- a/AndroidTest.xml
+++ b/AndroidTest.xml
@@ -15,6 +15,7 @@
~ limitations under the License.
-->
<configuration description="Config for cbor-java tests">
+ <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.adservices.apex" />
<option name="test-suite-tag" value="mts" />
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
@@ -25,4 +26,4 @@
<test class="com.android.tradefed.testtype.AndroidJUnitTest">
<option name="package" value="co.nstant.in.cbor"/>
</test>
-</configuration> \ No newline at end of file
+</configuration>
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 8208df6..943da69 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,7 +1,7 @@
{
"mainline-presubmit": [
{
- "name": "CborJavaTestCases"
+ "name": "CborJavaTestCases[com.google.android.adservices.apex]"
}
]
}