Merge changes I40eba694,I4423c4df

* changes:
  trusty: Add trusty_stats_test
  Add metrics to the zuma makefile
This commit is contained in:
Andrei Homescu 2023-03-22 18:41:32 +00:00 committed by Android (Google) Code Review
commit f05f42b7db

View file

@ -796,17 +796,19 @@ $(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 += \
tipc-test trusty-ut-ctrl \
tipc-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
$(call soong_config_set,google_displaycolor,displaycolor_platform,zuma) $(call soong_config_set,google_displaycolor,displaycolor_platform,zuma)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \