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

Commit 5e60de17 authored by Luke Huang's avatar Luke Huang
Browse files

Make doh_unit_test and doh_ffi_test can be run on the R platfrom 

To make the tests run in R platform, we need to have them statically link
libcrypto_static and libssl
1. Move doh_ffi_test into tests/.
2. doh_unit_test links libquiche_static instead of libquiche.
3. Minor cleanup, remove the useless soong var.

Bug: 155855709
Test: TH
Change-Id: I158691c7e62696fe3613ad5841cab01b45354b6c
parent f6526c49

Android.bp

+1 −29
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ license { 
    ],

}



// Whether to enable the targets in this file that require rust toolchain.

// Set to false in branches like mainline-prod where rust toolchain isn't supported.

support_rust_toolchain = true



cc_library_headers {

    name: "libnetd_resolv_headers",

    export_include_dirs: ["include"],
@@ -319,7 +315,6 @@ filegroup { 


rust_ffi_static {

    name: "libdoh_ffi",

    enabled: support_rust_toolchain,

    crate_name: "doh",

    srcs: ["doh.rs"],

    edition: "2018",
@@ -349,31 +344,8 @@ rust_ffi_static { 
    min_sdk_version: "29",

}



cc_test {

    name: "doh_ffi_test",

    enabled: support_rust_toolchain,

    test_suites: [

        "general-tests",

    ],

    defaults: ["netd_defaults"],

    srcs: ["doh_ffi_test.cpp"],

    static_libs: [

        "libdoh_ffi",

        "libgmock",

        "liblog",

        "libring-core",

    ],

    // These are not carried over from libdoh_ffi.

    shared_libs: [

        "libcrypto",

        "libssl",

    ],

    min_sdk_version: "29",

}



rust_test {

    name: "doh_unit_test",

    enabled: support_rust_toolchain,

    crate_name: "doh",

    srcs: ["doh.rs"],

    edition: "2018",
@@ -388,7 +360,7 @@ rust_test { 
        "liblazy_static",

        "liblibc",

        "liblog_rust",

        "libquiche",

        "libquiche_static",

        "libring",

        "libtokio",

        "liburl",

tests/Android.bp

+21 −0
Original line number Diff line number Diff line
@@ -279,3 +279,24 @@ cc_test { 
        "stats_proto",

    ],

}



cc_test {

    name: "doh_ffi_test",

    test_suites: [

        "general-tests",

    ],

    defaults: ["netd_defaults"],

    header_libs: [

        "libnetd_resolv_internal_headers",

    ],

    srcs: ["doh_ffi_test.cpp"],

    static_libs: [

        "libcrypto_static",

        "libdoh_ffi",

        "libgmock",

        "liblog",

        "libring-core",

        "libssl",

    ],

    min_sdk_version: "29",

}

doh_ffi_test.cpp→tests/doh_ffi_test.cpp

+0 −0

File moved.

View file