| commit | fdca8e2055ea8c832edb3ca02f63ba684e210148 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Feb 21 16:35:04 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Feb 21 16:35:04 2024 +0000 |
| tree | 9f316280caf870c827cf84b93079616b05ba159d | |
| parent | acafa40d826cf87338c179c27c5524489fb26e5d [diff] | |
| parent | f28e2841410f29051987b069ad51306ee738ea91 [diff] |
Merge "Drop TODO for flag enablement" into main
diff --git a/trusty/trusty-base.mk b/trusty/trusty-base.mk index 5aa4392..b21eca6 100644 --- a/trusty/trusty-base.mk +++ b/trusty/trusty-base.mk
@@ -35,7 +35,6 @@ LOCAL_KEYMINT_PRODUCT_PACKAGE := android.hardware.security.keymint-service.trusty endif -# TODO(b/306364873): move this to be flag-controlled? ifeq ($(SECRETKEEPER_ENABLED),true) LOCAL_SECRETKEEPER_PRODUCT_PACKAGE := android.hardware.security.secretkeeper.trusty else