tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add aconfig flags for rust keystore2" into main am: 2ff4165d26 am: 8537a2456f am: 608e05c481 am: 0afbfbd4fc

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

Change-Id: Icce9120ad7d6c28169cbfd1e826dd7168c0f7b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-09-27 23:38:23 +00:00 committed by Automerger Merge Worker
commit fb29c5eead
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
keystore2/Android.bp
View file

@ -28,6 +28,7 @@ rust_defaults {
defaults: [
"keymint_use_latest_hal_aidl_rust",
"keystore2_use_latest_aidl_rust",
"framework-minus-apex-aconfig-libraries",
],
rustlibs: [
@ -42,6 +43,7 @@ rust_defaults {
"android.security.metrics-rust",
"android.security.rkp_aidl-rust",
"libanyhow",
"libkeystore2_flags_rust",
"libbinder_rs",
"libkeystore2_aaid-rust",
"libkeystore2_apc_compat-rust",
@ -146,3 +148,16 @@ rust_binary {
],
afdo: true,
}
// Keystore Flag definitions
aconfig_declarations {
name: "keystore2_flags",
package: "android.security.keystore2",
srcs: ["aconfig/flags.aconfig"],
}
rust_aconfig_library {
name: "libkeystore2_flags_rust",
crate_name: "keystore2_flags",
aconfig_declarations: "keystore2_flags",
}

8
keystore2/aconfig/flags.aconfig Normal file
View file

@ -0,0 +1,8 @@
package: "android.security.keystore2"
flag {
name: "wal_db_journalmode"
namespace: "hardware_backed_security"
description: "This flag controls changing journalmode to wal"
bug: "191777960"
}