diff options
| author | David Drysdale <drysdale@google.com> | 2024-02-16 04:32:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 04:32:34 +0000 |
| commit | b87b79cef2b490a77478cb0a400c0550eaa02c00 (patch) | |
| tree | 1ca407130bc43cf041c1fdcbc47b4a5b31d5ac28 | |
| parent | 305b01c0bbe9b9345457220b83f958a7dd9ec2be (diff) | |
| parent | 69e83dde812ce2e067a78cac8300541efdf32090 (diff) | |
| download | generic-arm64-b87b79cef2b490a77478cb0a400c0550eaa02c00.tar.gz | |
Use standard flag to enable Secretkeeper am: 69e83dde81
Original change: https://android-review.googlesource.com/c/trusty/device/arm/generic-arm64/+/2936742
Change-Id: I04b3514eb0e3a1e590490d37b322c2f0f1058d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | project/generic-arm-inc.mk | 2 | ||||
| -rw-r--r-- | project/qemu-inc.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/generic-arm-inc.mk b/project/generic-arm-inc.mk index ed0a505..0234999 100644 --- a/project/generic-arm-inc.mk +++ b/project/generic-arm-inc.mk @@ -126,7 +126,7 @@ 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 + TRUSTY_SECRETKEEPER_USER_TASK := trusty/user/app/secretkeeper/app endif # diff --git a/project/qemu-inc.mk b/project/qemu-inc.mk index f0c2140..060b2f2 100644 --- a/project/qemu-inc.mk +++ b/project/qemu-inc.mk @@ -18,7 +18,7 @@ PROJECT_QEMU_INC_LOCAL_DIR := $(GET_LOCAL_DIR) APPLOADER_ALLOW_NS_CONNECT := true # Include Secretkeeper TA -TRUSTY_SECRETKEEPER_USER_TASK := trusty/user/app/secretkeeper/app +SECRETKEEPER_ENABLED := true include project/$(QEMU_TRUSTY_PROJECT).mk |