Merge "Allow usage of SdkLevel in the framework/wifi services"

This commit is contained in:
Treehugger Robot
2021-07-13 08:22:57 +00:00
committed by Gerrit Code Review

View File

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