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

Commit d1ebed1d authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Link static version of KeyMint lib in VTS tests" am: c3177488 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2458193



Change-Id: I84602e2920e333d8ad4edeb4641d037a3f0cab22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b590aa27 c3177488

confirmationui/aidl/vts/functional/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ cc_test { 
    name: "VtsHalConfirmationUITargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "keymint_use_latest_hal_aidl_ndk_shared",

        "keymint_use_latest_hal_aidl_ndk_static",

        "use_libaidlvintf_gtest_helper_static",

    ],

    srcs: [
@@ -31,8 +31,9 @@ cc_test { 
    ],

    static_libs: [

        "android.hardware.confirmationui-V1-ndk",

        "libcn-cbor",

        "android.hardware.confirmationui-support-lib",

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

        "libcn-cbor",

    ],

    shared_libs: [

        "libbinder_ndk",

gatekeeper/aidl/vts/functional/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -24,14 +24,17 @@ cc_test { 
    defaults: [

        "VtsHalTargetTestDefaults",

        "use_libaidlvintf_gtest_helper_static",

        "keymint_use_latest_hal_aidl_ndk_shared",

        "keymint_use_latest_hal_aidl_ndk_static",

    ],

    srcs: ["VtsHalGatekeeperTargetTest.cpp"],

    shared_libs: [

        "libbinder_ndk",

        "libbase",

    ],

    static_libs: ["android.hardware.gatekeeper-V1-ndk"],

    static_libs: [

        "android.hardware.gatekeeper-V1-ndk",

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

    ],

    test_suites: [

        "general-tests",

        "vts",