From 84d08775112daec71779eb4909e1f71d02053f56 Mon Sep 17 00:00:00 2001 From: Mike McTernan Date: Thu, 4 Jul 2024 15:47:51 +0100 Subject: [PATCH 1/2] APC/TUI: remove support for APC Flag: EXEMPT build file change Bug: 351151445 Test: m && test on device Change-Id: I927fd5063cd12b94d63fff3057ae54cee75e908d --- device.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/device.mk b/device.mk index e8544f5b..6d421fc9 100644 --- a/device.mk +++ b/device.mk @@ -82,7 +82,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/google_devices/common/chre/host/hal \ vendor/google/whitechapel/tools \ vendor/google/interfaces \ - vendor/google_devices/common/proprietary/confirmatioui_hal \ vendor/google_nos/host/android \ vendor/google_nos/test/system-test-harness \ vendor/google/camera @@ -864,8 +863,6 @@ PRODUCT_PACKAGES_DEBUG += \ trusty_stats_test \ trusty-coverage-controller \ -include device/google/gs101/confirmationui/confirmationui.mk - # Trusty Metrics Daemon PRODUCT_SOONG_NAMESPACES += \ vendor/google/trusty/common From 91d8fcccea41b082d67a4c7819aa96872c9efad4 Mon Sep 17 00:00:00 2001 From: Shikha Panwar Date: Mon, 8 Jul 2024 10:03:59 +0000 Subject: [PATCH 2/2] Zuma: Disable Secretkeeper HAL for aosp build The AOSP builds do not have a compatible BL for Secretkeeper (24Q3+). This leads the crashing of HAL since the backing trusty is not updated with the TA. Test: lunch aosp & non-aosp targets -> get_build_var SECRETKEEPER_ENABLED Bug: 350482613 Change-Id: I49d30914bc7a4b2b752a6d9eb7db0e7959638d98 --- device.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/device.mk b/device.mk index 3d6ea96c..2ad01444 100644 --- a/device.mk +++ b/device.mk @@ -92,6 +92,11 @@ TRUSTY_KEYMINT_IMPL := rust ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) # Set the environment variable to enable the Secretkeeper HAL service. 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 # OEM Unlock reporting