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

Commit c34cd882 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Properly use versioned interfaces. 

Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.

List generated with:
find . -name Android.bp -exec egrep \
    -H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \; \
    | grep -v oemnetd | grep -v tests/

Test: m
Bug: 133124190
(cherry-pick from aosp/968011)
Merged-In: Iaa979e836ad18a1507fa9c3b2522ea6d0b69c650
(cherry picked from commit bdf23af070640af069138ee19d4310dbb43c786f)

Change-Id: Iba9434cf20a6311105dac9107a80179518765bf7
parent 0c9f563d

Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ cc_test_library { 
    shared_libs: [

        "libbinder",

        "libutils",

        "netd_event_listener_interface-cpp",

        "netd_event_listener_interface-V1-cpp",

    ],

}
@@ -186,9 +186,9 @@ cc_test { 
        "libnetd_test_tun_interface",

        "liblogwrap",

        "libnetdutils",

        "netd_aidl_interface-cpp",

        "netd_event_listener_interface-cpp",

        "dnsresolver_aidl_interface-cpp",

        "netd_aidl_interface-V2-cpp",

        "netd_event_listener_interface-V1-cpp",

        "dnsresolver_aidl_interface-V2-cpp",

    ],

    compile_multilib: "both",

    sanitize: {

dns_responder/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ cc_library_static { 
        "libnetd_client",

        "libnetdutils",

        "libssl",

        "dnsresolver_aidl_interface-cpp",

        "netd_aidl_interface-cpp",

        "dnsresolver_aidl_interface-V2-cpp",

        "netd_aidl_interface-V2-cpp",

    ],

    static_libs: ["libutils"],

    include_dirs: [