diff options
| author | 2020-11-12 04:54:49 +0000 | |
|---|---|---|
| committer | 2020-11-12 04:54:49 +0000 | |
| commit | f17b792b577e4ae6fc402a4dbe6c3843874daf3c (patch) | |
| tree | 8605597b867147028130da704e3d8e87c567376c | |
| parent | b7bf21ddaf39f25041084842888debf1ff77ce23 (diff) | |
| parent | 0b6002dbf2d58663aea6c4a4c0dcb1e57ab891ac (diff) | |
Merge "services.net-module-wifi - set min_sdk_level to 30" am: ad8a87b69e am: 6c9fe5a3e7 am: 87cbfbff71 am: 0b6002dbf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475776
Change-Id: I70cf893293ed5a396cfb725a0dba1d124b2b1716
| -rw-r--r-- | services/net/Android.bp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/net/Android.bp b/services/net/Android.bp index 1ccd512a9daf..a52fe12150da 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -22,13 +22,14 @@ java_library_static { // Version of services.net for usage by the wifi mainline module. // 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. java_library { name: "services.net-module-wifi", srcs: [ ":framework-services-net-module-wifi-shared-srcs", ":net-module-utils-srcs", + ":net-utils-services-common-srcs", "java/android/net/ip/IpClientCallbacks.java", "java/android/net/ip/IpClientManager.java", "java/android/net/ip/IpClientUtil.java", @@ -39,6 +40,7 @@ java_library { "java/android/net/TcpKeepalivePacketData.java", ], sdk_version: "module_current", + min_sdk_version: "30", libs: [ "unsupportedappusage", "framework-wifi-util-lib", @@ -49,7 +51,6 @@ java_library { "netd_aidl_interface-V3-java", "netlink-client", "networkstack-client", - "net-utils-services-common", ], apex_available: [ "com.android.wifi", |