From e65972e2431c312a49ec8893d8dee91818397e69 Mon Sep 17 00:00:00 2001
From: Chalard Jean <jchalard@google.com>
Date: Mon, 26 Apr 2021 20:48:11 +0900
Subject: [PATCH] Allow usage of SdkLevel in the framework/wifi services

This is necessary for EthernetNetworkFactory because it uses
the static lib NetworkFactory which needs to test where it runs.
Wifi services also need this for its own factories.

Bug: 183902758
Test: ClientModeImplTest
      OemWifiNetworkFactoryTest
      TelephonyNetworkFactoryTest
      UntrustedWifiNetworkFactoryTest
      WifiNetworkFactoryTest
Change-Id: I73cc38d7857934fe50995c666915662de4c154ce
Merged-In: I73cc38d7857934fe50995c666915662de4c154ce
---
 services/net/Android.bp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/net/Android.bp b/services/net/Android.bp
index fb3db8b5ee525..a24d9731887ae 100644
--- a/services/net/Android.bp
+++ b/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",
     ],
 }