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

Commit 840d2b65 authored by Jeongik Cha's avatar Jeongik Cha Committed by android-build-merger
Browse files

Merge "Change AIDL module name" am: 4873cd61 

am: b5c22411

Change-Id: Id6e3eb88be306fafa3971388acb29fd07b7e1cb6
parents 93ed8072 b5c22411

Android.bp

+8 −8
Original line number Diff line number Diff line
@@ -70,7 +70,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-unstable-ndk_platform",

        "libbase",

        "libcutils",

        "libjsoncpp",
@@ -81,7 +81,7 @@ cc_library { 
        "libstatssocket",

        "libsysutils",

        "libutils",  // Used by libstatslog_resolv

        "netd_event_listener_interface-V1-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "server_configurable_flags",

        "stats_proto",

    ],
@@ -175,7 +175,7 @@ cc_test { 
        "libutils",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-cpp",

        "dnsresolver_aidl_interface-unstable-cpp",

        "libbase",

        "libgmock",

        "libnetd_test_dnsresponder",
@@ -184,8 +184,8 @@ cc_test { 
        "libnetd_test_tun_interface",

        "libnetd_test_utils",

        "libnetdutils",

        "netd_aidl_interface-V2-cpp",

        "netd_event_listener_interface-V1-cpp",

        "netd_aidl_interface-cpp",

        "netd_event_listener_interface-cpp",

    ],

    compile_multilib: "both",

    sanitize: {
@@ -214,9 +214,9 @@ cc_test { 
        "libbinder_ndk",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-V2-cpp",

        "dnsresolver_aidl_interface-V2-ndk_platform",

        "netd_event_listener_interface-V1-ndk_platform",

        "dnsresolver_aidl_interface-cpp",

        "dnsresolver_aidl_interface-ndk_platform",

        "netd_event_listener_interface-ndk_platform",

        "libgmock",

        "liblog",

        "libnetd_resolv",

tests/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ cc_test_library { 
    static_libs: [

        "libnetd_test_dnsresponder",

        "libnetdutils",

        "dnsresolver_aidl_interface-V2-cpp",

        "dnsresolver_aidl_interface-cpp",

    ],

}
@@ -44,9 +44,9 @@ cc_test { 
        "libnetd_test_dnsresponder",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "netd_aidl_interface-V2-cpp",

        "netd_aidl_interface-cpp",

        "netd_event_listener_interface-cpp",

        "dnsresolver_aidl_interface-V2-cpp",

        "dnsresolver_aidl_interface-cpp",

    ],

    compile_multilib: "both",

    sanitize: {

tests/dns_metrics_listener/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ cc_test_library { 
        "libutils",

    ],

    static_libs: [

        "netd_event_listener_interface-V1-cpp",

        "netd_event_listener_interface-cpp",

    ],

}

tests/dns_responder/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ cc_library_static { 
    name: "libnetd_test_dnsresponder",

    defaults: ["netd_defaults"],

    shared_libs: [

        "dnsresolver_aidl_interface-cpp",

        "dnsresolver_aidl_interface-unstable-cpp",

        "libbase",

        "libbinder",

        "libnetd_client",

        "libnetdutils",

        "libssl",

        "netd_aidl_interface-V2-cpp",

        "netd_aidl_interface-cpp",

    ],

    srcs: [

        "dns_responder.cpp",