Commit 9d7361a0 authored Jun 21, 2021 by Shawn Willden Committed by Automerger Merge Worker Jun 21, 2021

Merge "Revert^2 "Activate KeyMint."" into sc-dev am: 2a3c9238

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/15053362

Change-Id: I697a6d04dffd828ab2ee0603f45b6907d9df1aaf

parents ed7f9608 2a3c9238

trusty/trusty-base.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		# HAL loading of gatekeeper.trusty.

		PRODUCT_PACKAGES += \
		android.hardware.keymaster@4.0-service.trusty \
		android.hardware.security.keymint-service.trusty \
		android.hardware.gatekeeper@1.0-service.trusty \
		trusty_apploader