commit ebf4d9934ac4ebc23ff85abf277b21918f7e20b5
author Shawn Willden <swillden@google.com> Mon Jun 21 19:40:32 2021 +0000
committer Shawn Willden <swillden@google.com> Mon Jun 21 23:12:32 2021 +0000
tree 440cabe724301a66d023cd030cfa866edb04bafa
parent 42c5499945a37635dae4bbbc89013a2b3d326208

Revert^2 "Activate KeyMint"

8f0cd15159b5a3f7d0ddb5cc78d2a364d1982244

Bug: 177729159
Test: VtsAidlKeyMintTargetTest & CtsKeystoreTestCases
Change-Id: I1f6f4c27562104ee650cc085e977ebd4fecdfdf2

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1ca5183..12538be 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -77,3 +77,9 @@
 $(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.power.stats@1.0-service.gs101)
 $(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.power.stats@1.0-service.gs101.rc)
 $(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.power.stats@1.0-service.gs101.xml)
+
+# Keymaster to KeyMint
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.keymaster@4.0-service.trusty)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/init/android.hardware.keymaster@4.0-service.trusty.rc)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/etc/vintf/manifest/android.hardware.keymaster@4.0-service.trusty.xml)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/vendor/bin/hw/wait_for_strongbox)