Merge changes from topic "trusty-keymint"

* changes:
  [device.mk] Add Trusty tipc-test in debug target
  [device.mk] Enable Keymint and GateKeeper's Trusty implementation
  Update device.mk to include trusty-storage
This commit is contained in:
Armelle Laine 2021-07-22 21:18:39 +00:00 committed by Android (Google) Code Review
commit 54985abb82

View file

@ -749,11 +749,12 @@ PRODUCT_PACKAGES += \
endif endif
# 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 \
tipc-test
# Trusty ConfirmationUI HAL # Trusty ConfirmationUI HAL
#PRODUCT_PACKAGES += \ #PRODUCT_PACKAGES += \