diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-26 10:19:54 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-07-26 10:19:54 +0000 |
commit | 9d262fe357dd703316aa0012d88b4842b1c3f966 (patch) | |
tree | 40c623ddebe88d7a978e981c299933d575d7a38d | |
parent | 82e40c83487a2dcca45cc00f2fe70708bd3aefef (diff) | |
parent | 1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 (diff) | |
download | cbor-java-android13-mainline-go-art-release.tar.gz |
Snap for 8870366 from 1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 to mainline-go-art-releaseaml_go_art_330913000android13-mainline-go-art-release
Change-Id: Ia0b086577ab18e14c71d615db8bcf16b1abaf788
-rw-r--r-- | Android.bp | 11 | ||||
-rw-r--r-- | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | AndroidTest.xml | 3 | ||||
-rw-r--r-- | TEST_MAPPING | 2 |
4 files changed, 12 insertions, 5 deletions
@@ -37,7 +37,9 @@ java_library { srcs: [ "src/main/**/*.java", ], - + min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "core_current", apex_available: [ "//apex_available:platform", @@ -57,7 +59,12 @@ android_test { libs: [ "android.test.base", ], - min_sdk_version: "33", + test_mainline_modules: [ + "com.google.android.adservices.apex" + ], + min_sdk_version: "30", + // Setting target sdk to 10000 to prevent issues such as b/220675744 + target_sdk_version: "10000", sdk_version: "test_current", test_suites: [ "general-tests", diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a0c1c65..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="33" /> <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]" } ] } |