Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable GSC and Trusty for bringup

Browse source 
The GSC and Trusty images aren't currently flashed or available.

Test: Boot with changes
Signed-off-by: Kenny Root <kroot@google.com>
Change-Id: Ic8325ed6e0a25950a265e6c078ea3b791ede263b
This commit is contained in:
Kenny Root 2022-06-29 18:47:54 -07:00
parent 39439fa068
commit c301a51973
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
device.mk
View file

@ -554,7 +554,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M # Titan-M
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk #include hardware/google/pixel/dauntless/dauntless.mk
endif endif
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
@ -750,9 +750,17 @@ PRODUCT_PACKAGES += \
libopenvx-opencl libopenvx-opencl
endif 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) # Trusty (KM, GK, Storage)
$(call inherit-product, system/core/trusty/trusty-storage.mk) #$(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-base.mk)
# Trusty unit test tool # Trusty unit test tool
PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \ PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \