commit e65972e2431c312a49ec8893d8dee91818397e69
author Chalard Jean <jchalard@google.com> Mon Apr 26 20:48:11 2021 +0900
committer Chalard Jean <jchalard@google.com> Thu Jul 08 10:20:45 2021 +0000
tree 4713e248e26a8a14cd1db60ab0a4060ee06dccb1
parent 979367bc129b4a95a52b7dd490e77affe188945e

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

diff --git a/services/net/Android.bp b/services/net/Android.bp
index fb3db8b..a24d973 100644
--- a/services/net/Android.bp
+++ b/services/net/Android.bp
@@ -37,6 +37,7 @@
     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 @@
     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 @@
     ],
     visibility: [
         "//frameworks/base/packages/Tethering",
-        "//packages/modules/Connectivity/Tethering"
+        "//packages/modules/Connectivity/Tethering",
     ],
 }