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

Commit 91b21dd4 authored by lucaslin's avatar lucaslin
Browse files

Use netd-client instead of netd_aidl_interfaces-platform-java 

netd-client contains netd_aidl_interface-java and
netd_event_listener_interface-java which is almost the same as
netd_aidl_interfaces-platform-java.
The difference of them is that netd-client refers to the stable
netd aidl but netd_aidl_interfaces-platform-java refers to the
unstable one, so they cannot be put together, otherwise, there
will be a dependency problem in the build time.
Also, the libraries which are referring to the
netd_aidl_interfaces-unstable-java should also be changed to
netd_aidl_interfaces-java eventually when releasing.
So it's fine to use netd-client to replace
netd_aidl_interfaces-platform-java.

Bug: 174837473
Test: make; atest FrameworksNetTests
Change-Id: Ie8cbece445c4e0b79faf89e7ccbac2cbea115c9d
parent 6ae2535e

services/core/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -130,7 +130,7 @@ java_library_static { 
        "capture_state_listener-aidl-java",

        "capture_state_listener-aidl-java",

        "dnsresolver_aidl_interface-java",

        "dnsresolver_aidl_interface-java",

        "icu4j_calendar_astronomer",

        "icu4j_calendar_astronomer",

        "netd_aidl_interfaces-platform-java",

        "netd-client",

        "overlayable_policy_aidl-java",

        "overlayable_policy_aidl-java",

        "SurfaceFlingerProperties",

        "SurfaceFlingerProperties",

        "com.android.sysprop.watchdog",

        "com.android.sysprop.watchdog",

services/net/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ java_library_static { 
        ":services.net-sources",

        ":services.net-sources",

    ],

    ],

    static_libs: [

    static_libs: [

        "netd_aidl_interfaces-platform-java",

        "netd-client",

        "netlink-client",

        "netlink-client",

        "networkstack-client",

        "networkstack-client",

        "net-utils-services-common",

        "net-utils-services-common",