Merge "com.android.tethering: set min_sdk_version 30"
diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 5526c65..23aa7f8 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -17,6 +17,7 @@
java_defaults {
name: "TetheringAndroidLibraryDefaults",
sdk_version: "module_current",
+ min_sdk_version: "30",
srcs: [
"src/**/*.java",
":framework-tethering-shared-srcs",
@@ -58,7 +59,7 @@
"//apex_available:platform", // Used by InProcessTethering
"com.android.tethering",
],
- min_sdk_version: "current",
+ min_sdk_version: "30",
srcs: [
"jni/android_net_util_TetheringUtils.cpp",
],
@@ -119,7 +120,7 @@
// InProcessTethering is a replacement for Tethering
overrides: ["Tethering"],
apex_available: ["com.android.tethering"],
- min_sdk_version: "current",
+ min_sdk_version: "30",
}
// Updatable tethering packaged as an application
@@ -133,5 +134,5 @@
// The permission configuration *must* be included to ensure security of the device
required: ["NetworkPermissionConfig"],
apex_available: ["com.android.tethering"],
- min_sdk_version: "current",
+ min_sdk_version: "30",
}
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 0524374..a1e7fd2 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -17,7 +17,7 @@
apex {
name: "com.android.tethering",
updatable: true,
- min_sdk_version: "current",
+ min_sdk_version: "30",
java_libs: ["framework-tethering"],
bpfs: ["offload.o"],
apps: ["Tethering"],
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index ddb6880..a10729d 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -29,6 +29,7 @@
hostdex: true, // for hiddenapi check
apex_available: ["com.android.tethering"],
permitted_packages: ["android.net"],
+ min_sdk_version: "30",
}
filegroup {