Snap for 8871491 from 1edfc7e5d691ee7d8e7849cfe840121fb1a2d977 to mainline-go-cellbroadcast-releaseaml_go_cbr_330912000android13-mainline-go-cellbroadcast-release

Change-Id: I7db94d729f28aa542b5e00d15a55531796288d20

4 files changed, 12 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 922310c..3b27e4d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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]"
     }
   ]
 }