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

Commit 364b58fc authored by Luke Huang's avatar Luke Huang
Browse files

Use the lastest frozen dnsresolver_aidl_interface in libnetd_resolv 

Also refine some build targets since only test relevant target
can use unstable AIDL.

Bug: 151074535
Test: build
Change-Id: I2048aba093a263104a003c88d3ffff050941b005
parent 383be2c9

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ cc_library { 
    // Link most things statically to minimize our dependence on system ABIs.

    stl: "libc++_static",

    static_libs: [

        "dnsresolver_aidl_interface-unstable-ndk_platform",

        "dnsresolver_aidl_interface-ndk_platform",

        "libbase",

        "libcutils",

        "libjsoncpp",

tests/dns_responder/Android.bp

+9 −4
Original line number Diff line number Diff line 
// TODO: Remove libnetd_test_dnsresponder after eliminating all users.

cc_library_static {

cc_test_library {

    name: "libnetd_test_dnsresponder",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    shared_libs: [

        "dnsresolver_aidl_interface-unstable-cpp",

        "libbinder",

        "libnetd_client",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-unstable-cpp",

        "libcrypto_static",

        "libnetdutils",

        "libssl",

        "libutils",

        "netd_aidl_interface-cpp",

        "netd_event_listener_interface-cpp",

    ],

    srcs: [

        "dns_responder.cpp",
@@ -18,7 +23,7 @@ cc_library_static { 
    export_include_dirs: ["."],

}



cc_library {

cc_test_library {

    name: "libnetd_test_dnsresponder_ndk",

    defaults: ["netd_defaults", "resolv_test_defaults"],

    shared_libs: [
@@ -37,8 +42,8 @@ cc_library { 
        "libcrypto_static",

        "libnetdutils",

        "libssl",

        "netd_event_listener_interface-ndk_platform",

        "netd_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

    ],

    srcs: [

        "dns_responder.cpp",