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

Revert "Re-enable trusty for udfps." am: 883fbbb0ed am: 1feb0f897f

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

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

27
device.mk
View file

@ -796,24 +796,31 @@ 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)