diff options
| author | Xin Li <delphij@google.com> | 2023-08-14 15:36:24 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-08-14 15:36:24 -0700 |
| commit | 3e176e8a219a94667a5234b12bbfcdcb7f7eaa33 (patch) | |
| tree | 77ec2740277e4361522175b4f04e0a1d118c0e74 | |
| parent | c7a74bb912c762e441f00a379b1cea7bba795777 (diff) | |
| parent | f2160038b0b61c65147c527547404f0b88b99698 (diff) | |
| download | cbor-java-tmp_amf_298295554.tar.gz | |
Merge Android U (ab/10368041)tmp_amf_298295554
Bug: 291102124
Merged-In: I14a51df4bf0dfea66a69567f6d39ff4fbf357eaf
Change-Id: I78b8b341a754f305e29b7aa028e4f8ab89d3279f
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | AndroidTest.xml | 3 | ||||
| -rw-r--r-- | TEST_MAPPING | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5009bad..f5e6a1a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="co.nstant.in.cbor" > - <uses-sdk android:minSdkVersion="30" /> <application /> <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" 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]" } ] } |