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

Merge "Re-enable trusty for udfps." into udc-qpr-dev

Browse source
This commit is contained in:
Albert Chen 2023-06-21 03:41:36 +00:00 • committed by Android (Google) Code Review
commit 496a920a58
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

29
device.mk
View file

@ -795,31 +795,24 @@ PRODUCT_PACKAGES += \
libopenvx-opencl libopenvx-opencl
endif endif
# TODO[b/279647242]: 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 += \ PRODUCT_PACKAGES_DEBUG += \
# trusty-ut-ctrl \ trusty-ut-ctrl \
# tipc-test \ tipc-test \
# trusty_stats_test \ trusty_stats_test \
# include device/google/gs101/confirmationui/confirmationui.mk include device/google/gs101/confirmationui/confirmationui.mk
# Trusty Metrics Daemon # Trusty Metrics Daemon
# PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
# vendor/google/trusty/common vendor/google/trusty/common
#PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
# trusty_metricsd trusty_metricsd
# TODO(b/272725898): Needs to check with owner later # TODO(b/272725898): Needs to check with owner later
$(warning displaycolor_platform set to zuma on zumapro target) $(warning displaycolor_platform set to zuma on zumapro target)