ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "keymint-v3" into main am: 014c710c27 am: 735298c3b5

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

Change-Id: Ibbe734353e7f31857be5337a045276d238f8d656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Drysdale 2024-11-13 07:37:29 +00:00 • committed by Automerger Merge Worker
commit 8175edf8d3
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trusty/keymaster/Android.bp
View file

@ -121,7 +121,7 @@ cc_binary {
"libutils",
],
required: [
"android.hardware.hardware_keystore.xml",
"android.hardware.hardware_keystore_V3.xml",
],
}

7
trusty/keymint/Android.bp
View file

@ -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 {