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

Commit 38dd36ea authored by Max Bires's avatar Max Bires
Browse files

Shifting VTS libs to static_lib entry 

If these HALs aren't present on the device, then the test runner will
fail due to test binary trying to dynamically link to libs that aren't
present. Statically linking them will allow the test to fail gracefully
when the test harness sees that the HAL interfaces aren't available on
device.

Fixes: 184797684
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I0f8dea081a51256cfb0e50d6af20038e2b8f1f07
parent bd6647b4

security/keymint/aidl/vts/functional/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ cc_test { 
    shared_libs: [

        "libbinder_ndk",

        "libcrypto",

        "libkeymint",

        "libkeymint_support",

    ],

    static_libs: [

        "android.hardware.security.keymint-V1-ndk_platform",

        "android.hardware.security.secureclock-V1-ndk_platform",

        "libcppbor_external",

        "libcppcose_rkp",

        "libkeymint",

        "libkeymint_remote_prov_support",

        "libkeymint_support",

        "libkeymint_vts_test_utils",

    ],

    test_suites: [
@@ -69,8 +69,6 @@ cc_test_library { 
    shared_libs: [

        "libbinder_ndk",

        "libcrypto",

        "libkeymint",

        "libkeymint_support",

    ],

    static_libs: [

        "android.hardware.security.keymint-V1-ndk_platform",
@@ -78,7 +76,9 @@ cc_test_library { 
        "libcppbor_external",

        "libcppcose_rkp",

        "libgmock_ndk",

        "libkeymint",

        "libkeymint_remote_prov_support",

        "libkeymint_support",

    ],

}