diff options
| author | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-07-21 16:34:31 +0000 |
|---|---|---|
| committer | Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> | 2022-07-21 16:34:31 +0000 |
| commit | 42245c9692e08d134153350c876e482027a71e05 (patch) | |
| tree | 54cd1bac7c9597e38bd4bb21433698735cc0b0be | |
| parent | 1bf32ae176a07dd928297b90563486ba161ebc49 (diff) | |
| parent | aeff2df88f2b41be4ed557c4236dae6bb4c3fcc0 (diff) | |
| download | cbor-java-42245c9692e08d134153350c876e482027a71e05.tar.gz | |
[automerge] Fixes mainline-presubmit for cbor-java 2p: aeff2df88f
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cbor-java/+/19369670
Bug: 239268572
Change-Id: If5c54cb12aad1780b881c138a9e85a9abf62c30d
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | AndroidTest.xml | 3 | ||||
| -rw-r--r-- | TEST_MAPPING | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -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]" } ] } |