| commit | cd37fa58f1bcdd31c0ec773c95cdff39a28c402b | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Feb 21 17:55:45 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 21 17:55:45 2024 +0000 |
| tree | 531f52a15b2382c49a6fa3e0daa379036ec2f73c | |
| parent | 086b6f64686afaba02090d69b3fe6d54e266183b [diff] | |
| parent | 5a089ad035113ff788e991e5a1e6a1b63cf8d3ab [diff] |
Merge "Drop TODO for flag enablement" into main am: fdca8e2055 am: 5a089ad035 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2971137 Change-Id: I4604fe37b1b41ba565d38e4d3953349ef6a8c28d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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