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

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

Merge changes from topic "keymint-v3" into main am: 014c710c 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345023



Change-Id: Icd1a9341b61b24ac4ff1c461afc746867c3f4397
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ce2ae15 014c710c

trusty/keymaster/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ cc_binary { 
        "libutils",

    ],

    required: [

        "android.hardware.hardware_keystore.xml",

        "android.hardware.hardware_keystore_V3.xml",

    ],

}

trusty/keymint/Android.bp

+4 −3
Original line number Diff line number Diff line
@@ -42,9 +42,10 @@ rust_binary { 
    defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],

    init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],

    vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],

    required: [

        "android.hardware.hardware_keystore.xml",

    ],

    required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {

        true: ["android.hardware.hardware_keystore.xml"],

        default: ["android.hardware.hardware_keystore_V3.xml"],

    }),

}



rust_binary {