Merge "Allow usage of SdkLevel in the framework/wifi services" into sc-dev am: 580522c0d9

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

Change-Id: I24cce0dbd6d42b69f6523aa6366b59d2ad6a6008
This commit is contained in:
David Su
2021-05-04 16:28:49 +00:00
committed by Automerger Merge Worker

View File

@@ -52,7 +52,8 @@ 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
@@ -60,6 +61,7 @@ java_library {
"netd_aidl_interface-V3-java", "netd_aidl_interface-V3-java",
"netlink-client", "netlink-client",
"networkstack-client", "networkstack-client",
"modules-utils-build_system",
], ],
apex_available: [ apex_available: [
"com.android.wifi", "com.android.wifi",
@@ -80,7 +82,7 @@ filegroup {
], ],
visibility: [ visibility: [
"//frameworks/base/packages/Tethering", "//frameworks/base/packages/Tethering",
"//packages/modules/Connectivity/Tethering" "//packages/modules/Connectivity/Tethering",
], ],
} }