diff options
| author | Cody Schuffelen <schuffelen@google.com> | 2024-04-26 20:11:58 +0000 |
|---|---|---|
| committer | Cody Schuffelen <schuffelen@google.com> | 2024-05-09 00:14:19 +0000 |
| commit | f87300b935069949f06763a013243a347465170e (patch) | |
| tree | 290d28b8abde2ac597ee00bb1b6df2e80234ee19 | |
| parent | e9feea943b6eefb3e7c8fad3c33818753fb0cc31 (diff) | |
| download | cuttlefish-f87300b935069949f06763a013243a347465170e.tar.gz | |
Revert^2 "Use the in-guest secure hals by default."
This reverts commit e9feea943b6eefb3e7c8fad3c33818753fb0cc31.
Reason for revert: Immediate issue appears to be fixed with aosp/3077417.
ABTD runs (30 invocations across 3 runs)
- https://android-build.corp.google.com/builds/abtd/run/L33100030003717697
- https://android-build.corp.google.com/builds/abtd/run/L64700030003717604
- https://android-build.corp.google.com/builds/abtd/run/L22000030003659628
Bug: b/332977378
Change-Id: I05a26a96b886791ec4e1bfc4e15048313a05af08
| -rw-r--r-- | host/commands/assemble_cvd/flags_defaults.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/commands/assemble_cvd/flags_defaults.h b/host/commands/assemble_cvd/flags_defaults.h index b4e184df4..43d334d76 100644 --- a/host/commands/assemble_cvd/flags_defaults.h +++ b/host/commands/assemble_cvd/flags_defaults.h @@ -90,7 +90,8 @@ #define CF_DEFAULTS_USE_RANDOM_SERIAL false #define CF_DEFAULTS_SERIAL_NUMBER \ cuttlefish::ForCurrentInstance("CUTTLEFISHCVD") -#define CF_DEFAULTS_SECURE_HALS "keymint,gatekeeper,oemlock" +#define CF_DEFAULTS_SECURE_HALS \ + "oemlock,guest_keymint_insecure,guest_gatekeeper_insecure" #define CF_DEFAULTS_PROTECTED_VM false #define CF_DEFAULTS_MTE false |