diff options
| author | Andrei Homescu <ahomescu@google.com> | 2024-02-16 04:53:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 04:53:10 +0000 |
| commit | c038e17915b602862d7a536375c84f896e921848 (patch) | |
| tree | 55113b51afce64a47b6b6a3be26ca5989b1f3846 | |
| parent | 751c61fa6572f454a887eb764a822540eb406aaa (diff) | |
| parent | 14d4bbc051249649ea19b41e9b898d96f474e2cb (diff) | |
| download | keymaster-c038e17915b602862d7a536375c84f896e921848.tar.gz | |
Use system/libcppbor if available am: 14d4bbc051
Original change: https://android-review.googlesource.com/c/trusty/app/keymaster/+/2736441
Change-Id: If19d3e67effca7b1a76c906f911e32200f99eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | rules.mk | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -15,6 +15,7 @@ LOCAL_DIR := $(GET_LOCAL_DIR) NANOPB_DIR := external/nanopb-c +LIBCPPBOR_DIR := $(if $(wildcard system/libcppbor),system/libcppbor,external/libcppbor) MODULE := $(LOCAL_DIR) @@ -148,7 +149,7 @@ MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/system_state \ trusty/user/base/lib/tipc \ external/boringssl \ - external/libcppbor \ + $(LIBCPPBOR_DIR) \ # If KEYMASTER_WITH_HWWSK_SUPPORT is set Keymaster will be # compiled with Hardware Wrapped Storage key support |