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

Commit a960bc34 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherry-pick-rkp-hal-split" am: 75dd6a15 

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



Change-Id: Ic8cdbc6f0045518ee2440cf902325ff75525a378
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a03f9718 75dd6a15

identity/aidl/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ aidl_interface { 
    ],

    imports: [

        "android.hardware.keymaster-V3",

        "android.hardware.security.keymint-V3",

        "android.hardware.security.rkp-V3",

    ],

    stability: "vintf",

    frozen: false,

    frozen: true,

    backend: {

        java: {

            platform_apis: true,
@@ -32,28 +32,28 @@ aidl_interface { 
            version: "1",

            imports: [

                "android.hardware.keymaster-V3",

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

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "2",

            imports: [

                "android.hardware.keymaster-V3",

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

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "3",

            imports: [

                "android.hardware.keymaster-V3",

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

                "android.hardware.security.rkp-V1",

            ],

        },

        {

            version: "4",

            imports: [

                "android.hardware.keymaster-V3",

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

                "android.hardware.security.rkp-V3",

            ],

        },

identity/aidl/default/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ cc_library_static { 
        "libpuresoftkeymasterdevice",

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

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

        "android.hardware.security.rkp-V3-ndk",

    ],

}
@@ -112,6 +113,7 @@ cc_binary { 
        "android.hardware.keymaster-V3-ndk",

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

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

        "android.hardware.security.rkp-V3-ndk",

    ],

    srcs: [

        "service.cpp",

identity/aidl/vts/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ cc_test { 
        "libcrypto",

    ],

    static_libs: [

        "android.hardware.security.rkp-V3-cpp",

        "android.hardware.security.rkp-V3-ndk",

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

        "libcppbor_external",

        "libcppcose_rkp",

security/keymint/aidl/default/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ cc_binary { 
        "keymint_use_latest_hal_aidl_ndk_shared",

    ],

    shared_libs: [

        "android.hardware.security.rkp-V3-ndk",

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

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

        "libbase",

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

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ cc_defaults { 
        "libcrypto",

    ],

    static_libs: [

        "android.hardware.security.rkp-V3-ndk",

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

        "libcppbor_external",

        "libcppcose_rkp",