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

Commit b92fbe04 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Properly use versioned interfaces." 

am: 9572afce

Change-Id: Id7ae85343cd1c57982346ec54b01453ce16f32f9
parents fa5a2f5b 9572afce

packages/NetworkStack/Android.bp

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

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.annotation_annotation",

        "ipmemorystore-client",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "netd_aidl_interface-V2-java",

        "networkstack-aidl-interfaces-java",

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

        "datastallprotosnano",

        "datastallprotosnano",

        "networkstackprotosnano",

        "networkstackprotosnano",

        "captiveportal-lib",

        "captiveportal-lib",

packages/NetworkStack/tests/unit/Android.bp

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

        "libutilscallstack",

        "libziparchive",

        "libziparchive",

        "libz",

        "libz",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    ],

}

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

        "liblog",

        "libcutils",

        "libcutils",

        "libnativehelper",

        "libnativehelper",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    ],

    static_libs: [

    static_libs: [

        "libapf",

        "libapf",

services/core/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ java_library_static { 
        "android.hardware.configstore-V1.0-java",

        "android.hardware.configstore-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.0-java",

        "android.hidl.manager-V1.2-java",

        "android.hidl.manager-V1.2-java",

        "dnsresolver_aidl_interface-java",

        "dnsresolver_aidl_interface-V2-java",

        "netd_aidl_interface-java",

        "netd_aidl_interface-V2-java",

        "netd_event_listener_interface-java",

        "netd_event_listener_interface-java",

    ],

    ],

}

}

services/net/Android.bp

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

    name: "services.net",

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

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

    static_libs: [

    static_libs: [

        "dnsresolver_aidl_interface-java",

        "dnsresolver_aidl_interface-V2-java",

        "ipmemorystore-client",

        "ipmemorystore-client",

        "netd_aidl_interface-java",

        "netd_aidl_interface-V2-java",

        "networkstack-aidl-interfaces-java",

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

    ],

    ],

}

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

        "java/android/net/ipmemorystore/**/*.java",

    ],

    ],

    static_libs: [

    static_libs: [

        "ipmemorystore-aidl-interfaces-java",

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

    ],

    ],

}

}

services/tests/servicestests/Android.bp

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

        "libui",

        "libunwindstack",

        "libunwindstack",

        "libutils",

        "libutils",

        "netd_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    ],





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

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