Skip to content
Snippets Groups Projects
Commit bee20e84 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

com.android.tethering: set min_sdk_version 30

Tethering is updatable apex module that was launched in R, hence it and
all it dependencies should specify min_sdk_version <= 30.

Test: m
Bug: 171668006
Bug: 171330443
Change-Id: Ic91cf96dda6419d1038b0329b920f9cd24482aef
Exempt-From-Owner-Approval: Mark is owner and gave +2
parent d33087bc
No related branches found
No related tags found
No related merge requests found
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
java_defaults { java_defaults {
name: "TetheringAndroidLibraryDefaults", name: "TetheringAndroidLibraryDefaults",
sdk_version: "module_current", sdk_version: "module_current",
min_sdk_version: "30",
srcs: [ srcs: [
"src/**/*.java", "src/**/*.java",
":framework-tethering-shared-srcs", ":framework-tethering-shared-srcs",
...@@ -58,7 +59,7 @@ cc_library { ...@@ -58,7 +59,7 @@ cc_library {
"//apex_available:platform", // Used by InProcessTethering "//apex_available:platform", // Used by InProcessTethering
"com.android.tethering", "com.android.tethering",
], ],
min_sdk_version: "current", min_sdk_version: "30",
srcs: [ srcs: [
"jni/android_net_util_TetheringUtils.cpp", "jni/android_net_util_TetheringUtils.cpp",
], ],
...@@ -119,7 +120,7 @@ android_app { ...@@ -119,7 +120,7 @@ android_app {
// InProcessTethering is a replacement for Tethering // InProcessTethering is a replacement for Tethering
overrides: ["Tethering"], overrides: ["Tethering"],
apex_available: ["com.android.tethering"], apex_available: ["com.android.tethering"],
min_sdk_version: "current", min_sdk_version: "30",
} }
// Updatable tethering packaged as an application // Updatable tethering packaged as an application
...@@ -133,5 +134,5 @@ android_app { ...@@ -133,5 +134,5 @@ android_app {
// The permission configuration *must* be included to ensure security of the device // The permission configuration *must* be included to ensure security of the device
required: ["NetworkPermissionConfig"], required: ["NetworkPermissionConfig"],
apex_available: ["com.android.tethering"], apex_available: ["com.android.tethering"],
min_sdk_version: "current", min_sdk_version: "30",
} }
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
apex { apex {
name: "com.android.tethering", name: "com.android.tethering",
updatable: true, updatable: true,
min_sdk_version: "current", min_sdk_version: "30",
java_libs: ["framework-tethering"], java_libs: ["framework-tethering"],
bpfs: ["offload.o"], bpfs: ["offload.o"],
apps: ["Tethering"], apps: ["Tethering"],
......
...@@ -29,6 +29,7 @@ java_sdk_library { ...@@ -29,6 +29,7 @@ java_sdk_library {
hostdex: true, // for hiddenapi check hostdex: true, // for hiddenapi check
apex_available: ["com.android.tethering"], apex_available: ["com.android.tethering"],
permitted_packages: ["android.net"], permitted_packages: ["android.net"],
min_sdk_version: "30",
} }
filegroup { filegroup {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment