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

Commit 47d1ca16 authored by Luke Huang's avatar Luke Huang
Browse files

Fix resolver test failure caused by mismatching between libcrypto and 

libssl

In order to solve the coverage testing problem, aosp/1625082 moved
the dependency of resolv_{unit,gold}_test from libcrypto to
libcrypto_static.
However, in some testing combinations, the system libssl doesn't
match with the libcrypto_static.
To fix the problem, also statically link libssl for those tests.

Bug: 182710457
Test: Verified in forrest
https: //android-build.googleplex.com/builds/forrest/run/L69900000836471140
Change-Id: Ida52a6d1d7995bbc786071355a85e4775afe3a73
parent 72800649

tests/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ cc_test { 
    ],

    shared_libs: [

        "libbinder_ndk",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",
@@ -110,6 +109,7 @@ cc_test { 
        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "libssl",

        "netd_aidl_interface-lateststable-ndk_platform",

        "netd_event_listener_interface-lateststable-ndk_platform",

        "server_configurable_flags",
@@ -225,7 +225,6 @@ cc_test { 
    ],

    shared_libs: [

        "libbinder_ndk",

        "libssl",

    ],

    static_libs: [

        "dnsresolver_aidl_interface-lateststable-ndk_platform",
@@ -239,6 +238,7 @@ cc_test { 
        "libnetd_test_resolv_utils",

        "libnetdutils",

        "libprotobuf-cpp-lite",

        "libssl",

        "libstatslog_resolv",

        "libstatspush_compat",

        "libsysutils",