Merge "Use already compiled library" am: f347ef66de am: b868a560bf am: d7454f1430 am: 354d6b20d5

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

Change-Id: I8357e9898389cdcc2883dc519727dbbc95fb3aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anton Hansson
2022-05-31 19:50:27 +00:00
committed by Automerger Merge Worker

View File

@@ -34,30 +34,19 @@ java_library_static {
// with dependencies moved to frameworks/libs/net right. // with dependencies moved to frameworks/libs/net right.
java_library { java_library {
name: "services.net-module-wifi", name: "services.net-module-wifi",
srcs: [
":net-utils-services-common-srcs",
],
sdk_version: "module_current", sdk_version: "module_current",
min_sdk_version: "30", min_sdk_version: "30",
libs: [
"framework-annotations-lib",
"unsupportedappusage",
"framework-wifi-util-lib",
"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",
"net-utils-services-common",
], ],
apex_available: [ apex_available: [
"com.android.wifi", "com.android.wifi",
], ],
visibility: [ visibility: [
"//frameworks/opt/net/wifi/service",
"//frameworks/opt/net/wifi/tests/wifitests",
"//packages/modules/Wifi/service", "//packages/modules/Wifi/service",
"//packages/modules/Wifi/service/tests/wifitests", "//packages/modules/Wifi/service/tests/wifitests",
], ],