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

Commit 8e8f1754 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Only depend on the latest stable netd AIDL." into rvc-dev am:...

Merge "Only depend on the latest stable netd AIDL." into rvc-dev am: cb7f8e72 am: a0314e6a am: 6a59803f

Change-Id: I2e8f1441775471241eac02179c0860fa5ed5785a
parents 0c6a5e37 6a59803f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ java_library_static {
        "android.hardware.soundtrigger-V2.3-java",
        "android.hidl.manager-V1.2-java",
        "capture_state_listener-aidl-java",
        "dnsresolver_aidl_interface-V4-java",
        "netd_event_listener_interface-java",
        "dnsresolver_aidl_interface-java",
        "netd_aidl_interfaces-platform-java",
        "overlayable_policy_aidl-java",
    ],
}
+3 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ java_library_static {
        ":services.net-sources",
    ],
    static_libs: [
        "dnsresolver_aidl_interface-V4-java",
        "netd_aidl_interface-V3-java",
        "netd_aidl_interfaces-platform-java",
        "netlink-client",
        "networkstack-client",
        "net-utils-services-common",
@@ -44,7 +43,8 @@ java_library {
        "framework-wifi-util-lib",
    ],
    static_libs: [
        "dnsresolver_aidl_interface-V2-java",
        // 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",