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

Commit d262ba54 authored by Jiyong Park's avatar Jiyong Park
Browse files

Remove ndk_platform backend. Use the ndk backend. 

The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.

Ignore-AOSP-First: merge conflict expected when merged from AOSP.
Will cherry-pick after.

Bug: 161456198
Test: m
Change-Id: Iab535f4e2c9ba5017e9ee2e112ff20059e7f401b
parent ae08d6e4

Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ cc_library_headers { 
dnsresolver_aidl_interface_lateststable_version = "V8"



cc_library_static {

    name: "dnsresolver_aidl_interface-lateststable-ndk_platform",

    name: "dnsresolver_aidl_interface-lateststable-ndk",

    whole_static_libs: [

        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk_platform",

        "dnsresolver_aidl_interface-" + dnsresolver_aidl_interface_lateststable_version + "-ndk",

    ],

    apex_available: [

        "com.android.resolv",
@@ -191,7 +191,7 @@ cc_library { 
    // Link most things statically to minimize our dependence on system ABIs.

    stl: "libc++_static",

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libbase",

        "libcutils",

        "libnetdutils",
@@ -200,7 +200,7 @@ cc_library { 
        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk",

        "server_configurable_flags",

        "stats_proto",

    ],

tests/Android.bp

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

    ],

    static_libs: [

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk",

        "libnetd_test_dnsresponder_ndk",

        "libnetdutils",

        "libgmock",
@@ -100,7 +100,7 @@ cc_test { 
        "libbinder_ndk",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "golddata_proto",

        "libcrypto_static",

        "libdoh_ffi_for_test",
@@ -111,8 +111,8 @@ cc_test { 
        "libnetdutils",

        "libprotobuf-cpp-lite",

        "libssl",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "server_configurable_flags",

        "stats_proto",

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

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libgmock",

        "libnetd_test_dnsresponder_ndk",

        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libutils",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk",

        "netd_aidl_interface-lateststable-ndk",

    ],

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

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libbpf_android",

        "libcrypto_static",

        "libgmock",
@@ -186,8 +186,8 @@ cc_test { 
        "libnetdutils",

        "libssl",

        "libutils",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "libipchecksum",

        "resolv_unsolicited_listener",

        "libdoh_frontend_ffi",
@@ -231,9 +231,9 @@ cc_test { 
        "libbinder_ndk",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

        "libcrypto_static",

        "libcutils",

        "libdoh_ffi_for_test",

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-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk",

    ],

}

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-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libcrypto_static",

        "libnetdutils",

        "libssl",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "netd_aidl_interface-lateststable-ndk",

        "netd_event_listener_interface-lateststable-ndk",

    ],

    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-lateststable-ndk_platform",

        "dnsresolver_aidl_interface-lateststable-ndk",

        "libutils",

    ],

}