summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-11-12 02:53:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-11-12 02:53:27 +0000
commitad8a87b69e54a869d3d33f99ee29d6e4b60c2dd5 (patch)
tree75789eb134e94baeddd091ba5968dcf8e594e759
parent412a12977cfa0aa0722b5e0ea210f07058efd4fe (diff)
parent9ea81e9da33df3e54c87665b18d3e11f932dc547 (diff)
Merge "services.net-module-wifi - set min_sdk_level to 30"
-rw-r--r--services/net/Android.bp5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/net/Android.bp b/services/net/Android.bp
index 72ad36677c23..29bf37460568 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",