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

Browse source 
* changes:
  Declare previous version when using frozen HALs
  Set the proper FEATURE_HARDWARE_KEYSTORE version
This commit is contained in:
David Drysdale 2024-11-13 06:50:42 +00:00 • committed by Gerrit Code Review
commit 014c710c27
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", "libutils",
], ],
required: [ 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"], defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],
init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"], init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],
vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"], vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],
required: [ required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {
"android.hardware.hardware_keystore.xml", true: ["android.hardware.hardware_keystore.xml"],
], default: ["android.hardware.hardware_keystore_V3.xml"],
}),
} }
rust_binary { rust_binary {