From c8d4ad2a9d8bd6b6d8f9d2fbd9f2f6ec8036e82c Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Tue, 15 Jun 2021 09:00:01 +0000 Subject: Remove netlink-client dependency from net-module-wifi. Attempted to import net-utils-device-common lib in netlink-client to use Structure stuff and RdnssOption class to parse RDNSS RA option from the netlink message. However, seems to be some dependency issue like: Dependency path: via tag apex.dependencyTag: { name:javaLib payload:true sourceOnly:false} -> service-wifi{os:android,arch:common,apex:apex10000} via tag java.dependencyTag: { name:staticlib} -> wifi-service-pre-jarjar{os:android,arch:common,apex:apex10000} via tag java.dependencyTag: { name:staticlib} -> services.net-module-wifi{os:android,arch:common,apex:apex10000} via tag java.dependencyTag: { name:staticlib} -> netlink-client{os:android,arch:common,apex:apex10000} via tag java.dependencyTag: { name:staticlib} -> net-utils-device-common{os:android,arch:common,apex:apex10000} via tag java.dependencyTag: { name:staticlib} -> net-utils-framework-common{os:android,arch:common,apex:apex10000} If the net-module-wifi doesn't require netlink-client lib, then probably we can remove the netlink-client dependency and fix above conflict. Bug: 163492391 Test: m Change-Id: Ic3261f391d8c8ac0d5576ef908c75b1a329f0453 --- services/net/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/net/Android.bp b/services/net/Android.bp index 292671a43ca7..f04988b419da 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -58,7 +58,6 @@ java_library { // 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", - "netlink-client", "networkstack-client", ], apex_available: [ -- cgit v1.2.3-59-g8ed1b