From 9ea81e9da33df3e54c87665b18d3e11f932dc547 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Wed, 4 Nov 2020 17:19:16 +0000
Subject: [PATCH] services.net-module-wifi - set min_sdk_level to 30

Also migrate to using net-utils-services-common-srcs.

Bug: 171330443
Test: compiles
Change-Id: If0865d7c0bf3164911911ef2a1700bca3d7cc11f
---
 services/net/Android.bp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/net/Android.bp b/services/net/Android.bp
index afea1a073caba..7844b72e3bf2c 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",