From 48eb28f7eecdf7cc38003757f78e469a6f1b81bb Mon Sep 17 00:00:00 2001
From: Pedro Loureiro <pedroql@google.com>
Date: Fri, 12 Sep 2025 12:20:36 +0000
Subject: [PATCH] Bump the min sdk of Tethering

This is required because we are bumping the min sdk of NetworkStack
which this depends on.

Test: build locally + aapt2 dump badging

Bug: 444168252

Flag: build.RELEASE_DEPRECATE_MAINLINE_R_SUPPORT
Change-Id: Idbff03cdcca9955a4759c19866895f755abedaaf
---
 Tethering/Android.bp                  |  5 ++++-
 Tethering/tests/privileged/Android.bp |  5 ++++-
 Tethering/tests/unit/Android.bp       |  5 ++++-
 tests/common/Android.bp               | 11 ++++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index ad6b28c36a..2ffae71763 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -22,7 +22,10 @@ package {
 java_defaults {
     name: "TetheringApiLevel",
     sdk_version: "module_current",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
 }
 
 java_defaults {
diff --git a/Tethering/tests/privileged/Android.bp b/Tethering/tests/privileged/Android.bp
index 3597a91546..76b1521bf8 100644
--- a/Tethering/tests/privileged/Android.bp
+++ b/Tethering/tests/privileged/Android.bp
@@ -53,5 +53,8 @@ android_test {
         "TetheringApiCurrentLib",
     ],
     compile_multilib: "both",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
 }
diff --git a/Tethering/tests/unit/Android.bp b/Tethering/tests/unit/Android.bp
index c2826186e3..de4c176576 100644
--- a/Tethering/tests/unit/Android.bp
+++ b/Tethering/tests/unit/Android.bp
@@ -45,7 +45,10 @@ java_library {
 
 java_defaults {
     name: "TetheringTestsDefaults",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 420cd2bb0f..49e4e8251d 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -77,7 +77,10 @@ java_genrule {
 
 android_library {
     name: "ConnectivityCoverageTestsLib",
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     static_libs: [
         "ConnectivityUnitTestsLib",
         "NetdStaticLibTestsLib",
@@ -93,8 +96,10 @@ android_library {
 
 android_test {
     name: "ConnectivityCoverageTests",
-    // Tethering started on SDK 30
-    min_sdk_version: "30",
+    min_sdk_version: select(release_flag("RELEASE_DEPRECATE_MAINLINE_R_SUPPORT"), {
+        true: "31",
+        default: "30",
+    }),
     test_suites: [
         "general-tests",
         "mts-tethering",