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

Commit be2f87f0 authored by Bruce Chen's avatar Bruce Chen Committed by android-build-merger
Browse files

Merge "[Resolv] Removing the relative paths between netd and resolv." am: 816cb76f1d 

am: 90b73699da

Change-Id: I7cb1a5ae9f411b12ad2e9e0152ab9c65c2437581
parents 8c259fbb 2e2446c2

Android.bp

+12 −2
Original line number Diff line number Diff line
@@ -3,6 +3,16 @@ cc_library_headers { 
    export_include_dirs: ["include"],

}



//For the test to use

//TODO: 1. Need to Refactor ResolverStats related code(ex: ResolverController::getDnsInfo).

//         Then removing this library header file.

//      2. Change the imports path in netd/TEST_MAPPING after migrating from

//         system/netd/resolv to packages/modules/resolv.

cc_library_headers {

    name: "libnetd_resolv_internal_headers",

    export_include_dirs: ["."],

}



aidl_interface {

    name: "dnsresolver_aidl_interface",

    local_include_dir: "binder",
@@ -151,8 +161,8 @@ cc_test { 
        "resolver_test.cpp",

        "tests/resolv_test_utils.cpp",

    ],

    include_dirs: [

        "system/netd/resolv/include",

    header_libs: [

        "libnetd_resolv_headers",

    ],

    shared_libs: [

        "libbase",

tests/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ cc_test { 
        "resolv_stress_test.cpp",

        "resolv_test_utils.cpp",

    ],

    include_dirs: [

        "system/netd/resolv",

        "system/netd/resolv/include",

    header_libs: [

        "libnetd_resolv_headers",

        "libnetd_resolv_internal_headers",

    ],

    shared_libs: [

        "libbase",