Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776

Change-Id: I639b05c29d4ab88a0c9eaa5278ad5b97db3dcb00
This commit is contained in:
David Su
2020-11-12 03:31:40 +00:00
committed by Automerger Merge Worker
parent 3943ca7598 ad8a87b69e
commit 6c9fe5a3e7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/net/Android.bp
View File

@@ -22,13 +22,14 @@ java_library_static {
// Version of services.net for usage by the wifi mainline module. // Version of services.net for usage by the wifi mainline module.
// Note: This is compiled against module_current. // Note: This is compiled against module_current.
// TODO(b/145825329): This should be moved to networkstack-client, // TODO(b/172457099): This should be moved to networkstack-client,
// with dependencies moved to frameworks/libs/net right. // with dependencies moved to frameworks/libs/net right.
java_library { java_library {
name: "services.net-module-wifi", name: "services.net-module-wifi",
srcs: [ srcs: [
":framework-services-net-module-wifi-shared-srcs", ":framework-services-net-module-wifi-shared-srcs",
":net-module-utils-srcs", ":net-module-utils-srcs",
":net-utils-services-common-srcs",
"java/android/net/ip/IpClientCallbacks.java", "java/android/net/ip/IpClientCallbacks.java",
"java/android/net/ip/IpClientManager.java", "java/android/net/ip/IpClientManager.java",
"java/android/net/ip/IpClientUtil.java", "java/android/net/ip/IpClientUtil.java",
@@ -39,6 +40,7 @@ java_library {
"java/android/net/TcpKeepalivePacketData.java", "java/android/net/TcpKeepalivePacketData.java",
], ],
sdk_version: "module_current", sdk_version: "module_current",
min_sdk_version: "30",
libs: [ libs: [
"unsupportedappusage", "unsupportedappusage",
"framework-wifi-util-lib", "framework-wifi-util-lib",
@@ -49,7 +51,6 @@ java_library {
"netd_aidl_interface-V3-java", "netd_aidl_interface-V3-java",
"netlink-client", "netlink-client",
"networkstack-client", "networkstack-client",
"net-utils-services-common",
], ],
apex_available: [ apex_available: [
"com.android.wifi", "com.android.wifi",