diff options
| author | David Drysdale <drysdale@google.com> | 2024-02-16 04:31:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 04:31:58 +0000 |
| commit | 5cb4ce035f1b18b7db48748b9ec5c6b524fb0f0b (patch) | |
| tree | 543d9b3fdb6d144be2a20a7767a9a89e3ce0eb44 | |
| parent | 7f4c51b75d7c0b032da549c3b39387c6eb009dbb (diff) | |
| parent | 16ecbd275ea6c203944f8254918fbb546e83f145 (diff) | |
| download | generic-arm64-5cb4ce035f1b18b7db48748b9ec5c6b524fb0f0b.tar.gz | |
Optionally include the Secretkeeper TA am: 16ecbd275e
Original change: https://android-review.googlesource.com/c/trusty/device/arm/generic-arm64/+/2824499
Change-Id: Ifd21d2bdb7e563c419743be2ac67fa9e1d39e99e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | project/generic-arm-inc.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/project/generic-arm-inc.mk b/project/generic-arm-inc.mk index fbbecfb..ed0a505 100644 --- a/project/generic-arm-inc.mk +++ b/project/generic-arm-inc.mk @@ -124,6 +124,11 @@ else TRUSTY_KEYMINT_USER_TASK := trusty/user/app/keymaster endif +# Allow inclusion of the Secretkeeper TA to be selected at build time. +ifeq (true,$(call TOBOOL,$(SECRETKEEPER_ENABLED))) + TRUSTY_SECRETKEEPER_USER_TASK := trusty/user/app/secretkeeper +endif + # # Modules to be compiled into lk.bin # @@ -163,6 +168,7 @@ TRUSTY_BUILTIN_USER_TASKS := \ trusty/user/app/confirmationui \ trusty/user/app/gatekeeper \ $(TRUSTY_KEYMINT_USER_TASK) \ + $(TRUSTY_SECRETKEEPER_USER_TASK) \ trusty/user/app/sample/hwaes \ trusty/user/app/sample/hwbcc \ trusty/user/app/sample/hwcrypto \ |