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

Commit c5d273a9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use latest Identity and KM AIDL API" am: 34565c65 

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



Change-Id: Ifd3588a53e81e9e24bc743382772dc6cf9cb56cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1065f69 34565c65

identity/aidl/default/Android.bp

+5 −3
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ package { 
cc_library_static {

    name: "android.hardware.identity-libeic-hal-common",

    vendor_available: true,

    defaults: [

        "identity_use_latest_hal_aidl_ndk_static",

        "keymint_use_latest_hal_aidl_ndk_static",

    ],

    srcs: [

        "common/IdentityCredential.cpp",

        "common/IdentityCredentialStore.cpp",
@@ -40,9 +44,7 @@ cc_library_static { 
        "libsoft_attestation_cert",

        "libpuresoftkeymasterdevice",

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

        "android.hardware.identity-V4-ndk",

        "android.hardware.keymaster-V3-ndk",

        "android.hardware.security.keymint-V2-ndk",

    ],

}
@@ -83,6 +85,7 @@ cc_binary { 
    vintf_fragments: ["identity-default.xml"],

    vendor: true,

    defaults: [

        "identity_use_latest_hal_aidl_ndk_static",

        "keymint_use_latest_hal_aidl_ndk_static",

    ],

    cflags: [
@@ -106,7 +109,6 @@ cc_binary { 
        "libsoft_attestation_cert",

        "libpuresoftkeymasterdevice",

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

        "android.hardware.identity-V4-ndk",

        "android.hardware.keymaster-V3-ndk",

        "android.hardware.identity-libeic-hal-common",

        "android.hardware.identity-libeic-library",

identity/aidl/vts/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ cc_test { 
    name: "VtsHalIdentityTargetTest",

    defaults: [

        "VtsHalTargetTestDefaults",

        "identity_use_latest_hal_aidl_cpp_static",

        "keymint_use_latest_hal_aidl_cpp_static",

        "keymint_use_latest_hal_aidl_ndk_static",

        "use_libaidlvintf_gtest_helper_static",
@@ -46,7 +47,6 @@ cc_test { 
        "libpuresoftkeymasterdevice",

        "android.hardware.keymaster@4.0",

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

        "android.hardware.identity-V4-cpp",

        "android.hardware.keymaster-V3-cpp",

        "android.hardware.keymaster-V3-ndk",

        "libkeymaster4support",