Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22e38240 authored by Xiao Ma's avatar Xiao Ma
Browse files

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

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

Merged-In: Icd239381afa8d9b16ba769100e3fa2189b19d7b2
(cherry picked from commit 4b93b461)

Change-Id: If5e0307f8b0b0201a76a75cf0e78b31e20a20e1a
parent 6136babd
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,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",
        "modules-utils-build_system",
    ],