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

Merge "Revert "Revert "Re-enable trusty for udfps.""" into udc-qpr-dev am: 0ecab3e3a0 am: 3243183c4d

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zumapro/+/23897830

Change-Id: I0ce2a2f09ab4f7d90e9946966967516ea6fa0597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrew Chant 2023-07-10 23:44:51 +00:00 • committed by Automerger Merge Worker
commit 46564dc812
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
device.mk
View file

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