From 9922a0fc126053a5fbbff13a576f12850e5d364b Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Mon, 25 Mar 2024 16:34:05 +0000 Subject: [PATCH] Revert "Enable Secretkeeper HAL service on gs201" This reverts commit a929e8bc02a747e418b3b5e890f3d892c4ed14cb. Reason for revert: disable until gs201/main prebuilts get updated The gs201/main prebuilts are a couple of weeks old, which means that some heap size fixes for the Secretkeeper TA are not present for these devices. This in turn blocks: - aosp/2997056: re-enable SK in pVMs - aosp/3000947: add large DICE chain VTS tests So revert for now, so we can submit those two CLs and have Secretkeeper test coverage happening on shusky. Then when gs201/main prebuilts are updated to something more recent (i.e. that includes aosp/3005090), we can re-enable the HAL service. Bug: 291228655 Bug: 306364873 Change-Id: I543310092ad6430a2dee30ae0b950fadbe869e15 --- device.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/device.mk b/device.mk index 3cf89d31..f8f116b7 100644 --- a/device.mk +++ b/device.mk @@ -82,11 +82,6 @@ PRODUCT_SOONG_NAMESPACES += \ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4 -ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) - # Set the environment variable to enable the Secretkeeper HAL service. - SECRETKEEPER_ENABLED := true -endif - # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -254,7 +249,7 @@ PRODUCT_PACKAGES += \ PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ vendor.mali.debug.config=/vendor/etc/mali/debug.config \ - vendor.mali.base_protected_max_core_count=1 \ + vendor.mali.base_protected_max_core_count=1 \ vendor.mali.base_protected_tls_max=67108864 \ vendor.mali.platform_agt_frequency_khz=24576