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

Commit 0a3d775d authored by Jeongik Cha's avatar Jeongik Cha
Browse files

Declare/Use lateststable/tot wrapper for aidl_interface 

Test: m
Bug: 150578172
Ignore-AOSP-First: aidl version mismatch

Change-Id: If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1
Merged-In: If9041a8a5e06afb528cdcc7d6ecd9a65082fc7d1
parent 9bbd4758

Android.bp

+18 −5
Original line number Diff line number Diff line
@@ -51,6 +51,19 @@ cc_library_headers { 
    ],

}



dnsresolver_aidl_interface_lateststable_version = "V7"



cc_library_static {

    name: "dnsresolver_aidl_interface-lateststable-ndk_platform",

    whole_static_libs: [

        "dnsresolver_aidl_interface-ndk_platform",

    ],

    apex_available: [

        "com.android.resolv",

    ],

    min_sdk_version: "29",

}



aidl_interface {

    name: "dnsresolver_aidl_interface",

    local_include_dir: "binder",
@@ -165,7 +178,7 @@ cc_library { 
    // Link most things statically to minimize our dependence on system ABIs.

    stl: "libc++_static",

    static_libs: [

        "dnsresolver_aidl_interface-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "libbase",

        "libcutils",

        "libnetdutils",
@@ -173,7 +186,7 @@ cc_library { 
        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "netd_event_listener_interface-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -306,9 +319,9 @@ cc_test { 
        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "libcutils",

        "libgmock",

        "libnetd_resolv",

tests/Android.bp

+10 −10
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ cc_test_library { 
        "libutils",

    ],

    static_libs: [

        "netd_aidl_interface-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "libnetd_test_dnsresponder_ndk",

        "libnetdutils",

        "libgmock",
@@ -102,7 +102,7 @@ cc_test { 
        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "golddata_proto",

        "libgmock",

        "libnetd_resolv",
@@ -110,8 +110,8 @@ cc_test { 
        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -138,14 +138,14 @@ cc_test { 
        "libnetd_client",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "libgmock",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libutils",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

    ],

}
@@ -173,7 +173,7 @@ cc_test { 
        "libnetd_client",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "libcrypto_static",

        "libgmock",

        "libnetd_test_dnsresponder_ndk",
@@ -182,8 +182,8 @@ cc_test { 
        "libnetdutils",

        "libssl",

        "libutils",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "libipchecksum",

        "resolv_unsolicited_listener",

    ],

tests/dns_metrics_listener/Android.bp

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

    static_libs: [

        "libutils",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

    ],

}

tests/dns_responder/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ cc_test_library { 
        "libnetd_resolv_internal_headers",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "libcrypto_static",

        "libnetdutils",

        "libssl",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-unstable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

    ],

    srcs: [

        "dns_responder.cpp",

tests/unsolicited_listener/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ cc_test_library { 
        "libbinder_ndk",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "libutils",

    ],

}