Merge "Allow usage of SdkLevel in the framework/wifi services" am: 25b4755974

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

Change-Id: I4f74530f00952a44b1777c6ce8cbd9188c662897

services/net/Android.bp

@@ -37,6 +37,7 @@ java_library {
     name: "services.net-module-wifi",
     srcs: [
         ":framework-services-net-module-wifi-shared-srcs",
+        ":net-module-utils-srcs",
         ":net-utils-services-common-srcs",
     ],
     sdk_version: "module_current",
@@ -44,13 +45,15 @@ java_library {
     libs: [
         "unsupportedappusage",
         "framework-wifi-util-lib",
-        "framework-connectivity"
+        "framework-connectivity",
+        "modules-utils-build_system",
     ],
     static_libs: [
         // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the
         // classes generated by netd_aidl_interfaces-platform-java above.
         "netd_aidl_interface-V3-java",
         "networkstack-client",
+        "modules-utils-build_system",
     ],
     apex_available: [
         "com.android.wifi",
@@ -71,7 +74,7 @@ filegroup {
     ],
     visibility: [
         "//frameworks/base/packages/Tethering",
-        "//packages/modules/Connectivity/Tethering"
+        "//packages/modules/Connectivity/Tethering",
     ],
 }