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

Commit efc774b7 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge "Properly use versioned interfaces." into qt-dev

parents 35dd095a cb29c2b2

packages/NetworkStack/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ android_library { 
    static_libs: [

        "androidx.annotation_annotation",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "networkstack-aidl-interfaces-java",

        "netd_aidl_interface-V2-java",

        "networkstack-aidl-interfaces-V3-java",

        "datastallprotosnano",

        "networkstackprotosnano",

        "captiveportal-lib",

packages/NetworkStack/tests/unit/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ android_test { 
        "libutilscallstack",

        "libziparchive",

        "libz",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

}
@@ -94,7 +94,7 @@ cc_library_shared { 
        "liblog",

        "libcutils",

        "libnativehelper",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    static_libs: [

        "libapf",

services/core/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,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-java",

        "netd_aidl_interface-java",

        "dnsresolver_aidl_interface-V2-java",

        "netd_aidl_interface-V2-java",

        "netd_event_listener_interface-java",

    ],

}

services/net/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -65,10 +65,10 @@ java_library_static { 
    name: "services.net",

    srcs: ["java/**/*.java"],

    static_libs: [

        "dnsresolver_aidl_interface-java",

        "dnsresolver_aidl_interface-V2-java",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "networkstack-aidl-interfaces-java",

        "netd_aidl_interface-V2-java",

        "networkstack-aidl-interfaces-V3-java",

    ],

}
@@ -81,7 +81,7 @@ java_library_static { 
        "java/android/net/ipmemorystore/**/*.java",

    ],

    static_libs: [

        "ipmemorystore-aidl-interfaces-java",

        "ipmemorystore-aidl-interfaces-V3-java",

    ],

}

services/tests/servicestests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ android_test { 
        "libui",

        "libunwindstack",

        "libutils",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],



    dxflags: ["--multi-dex"],