From c301a51973064dbb9d05ad7d00efd1b51d76e839 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 29 Jun 2022 18:47:54 -0700 Subject: [PATCH] Disable GSC and Trusty for bringup The GSC and Trusty images aren't currently flashed or available. Test: Boot with changes Signed-off-by: Kenny Root Change-Id: Ic8325ed6e0a25950a265e6c078ea3b791ede263b --- device.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/device.mk b/device.mk index 267086bb..350d12cb 100644 --- a/device.mk +++ b/device.mk @@ -554,7 +554,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) # Titan-M ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) -include hardware/google/pixel/dauntless/dauntless.mk +#include hardware/google/pixel/dauntless/dauntless.mk endif PRODUCT_PACKAGES_DEBUG += \ @@ -750,9 +750,17 @@ PRODUCT_PACKAGES += \ libopenvx-opencl endif +# TODO[b/XXXX]: Re-enable Trusty and disable this when Trusty is working +PRODUCT_PACKAGES += \ + android.hardware.keymaster@4.1-service \ + android.hardware.gatekeeper@1.0-service.software +LOCAL_KEYMASTER_PRODUCT_PACKAGE := android.hardware.keymaster@4.1-service +LOCAL_GATEKEEPER_PRODUCT_PACKAGE := android.hardware.gatekeeper@1.0-service.software + # Trusty (KM, GK, Storage) -$(call inherit-product, system/core/trusty/trusty-storage.mk) -$(call inherit-product, system/core/trusty/trusty-base.mk) +#$(call inherit-product, system/core/trusty/trusty-storage.mk) +#$(call inherit-product, system/core/trusty/trusty-base.mk) + # Trusty unit test tool PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \