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

Commit 144af035 authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Add '-unstable' to solve ODR violation 

The interface which is imported by an unstable interface is 'unstable'
as well. Until now, the ODR violation checker in aidl has omitted an
interface imported, but it will be checked, accordingly, fix the current
problem

Bug: 146436251
Test: m nothing
Change-Id: I05c0ca6b545eed3b37f95e4f41502f674ba09242
parent 957333d2

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ cc_library { 
        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -267,7 +267,7 @@ cc_test { 
    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "libcutils",

        "libgmock",

        "libnetd_resolv",

tests/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ cc_test { 
        "libnetdutils",

        "libprotobuf-cpp-lite",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -135,7 +135,7 @@ cc_test { 
        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libutils",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_aidl_interface-ndk_platform",

    ],

}
@@ -175,7 +175,7 @@ cc_test { 
        "libssl",

        "libutils",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "libipchecksum",

    ],

    // This test talks to the DnsResolver module over a binary protocol on a socket, so keep it as

tests/dns_metrics_listener/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ cc_test_library { 
    ],

    static_libs: [

        "libutils",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

    ],

}

tests/dns_responder/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ cc_test_library { 
        "libnetdutils",

        "libssl",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

    ],

    srcs: [

        "dns_responder.cpp",