LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717

Change-Id: I652a8be5f230b1e88474e6944dc4a3306db896e9
This commit is contained in:
Nikita Ioffe
2020-11-09 05:34:45 +00:00
committed by Automerger Merge Worker
parent 668adf955c 06bf173b20
commit b2bfb81567
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tethering/Android.bp
View File

@@ -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 {
"//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 {
// 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 {
// 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",
} }

2
Tethering/apex/Android.bp
View File

@@ -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"],

1
Tethering/common/TetheringLib/Android.bp
View File

@@ -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 {