Zuma: Enable Secretkeeper on aosp targets am: 72946bd429 am: bb3fb6aa85

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3287155

Change-Id: I81a6e406ccf40cf13b65d7c57b88c24fe2101a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shikha Panwar 2024-09-30 16:08:26 +00:00 committed by Automerger Merge Worker
commit 42cb622a74

View file

@ -95,11 +95,6 @@ TRUSTY_KEYMINT_IMPL := rust
ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
# Set the environment variable to enable the Secretkeeper HAL service. # Set the environment variable to enable the Secretkeeper HAL service.
SECRETKEEPER_ENABLED := true SECRETKEEPER_ENABLED := true
# TODO(b/341708664): Enable Secretkeeper unconditionally once AOSP targets are built with
# compatible bootloader (24Q3+).
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
SECRETKEEPER_ENABLED := false
endif
endif endif
# OEM Unlock reporting # OEM Unlock reporting