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

Commit 3cbbd603 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Only depend on the latest stable netd AIDL." am: da8f7afd

Change-Id: I7ea587339e101b655fe088ad72b1ea52013a3b68
parents a77d1056 da8f7afd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ java_library_static {
        "android.hardware.configstore-V1.0-java",
        "android.hardware.contexthub-V1.0-java",
        "android.hidl.manager-V1.2-java",
        "dnsresolver_aidl_interface-V4-java",
        "netd_event_listener_interface-java",
        "dnsresolver_aidl_interface-java",
        "netd_aidl_interfaces-platform-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",