Merge "Adjust for library rename" am: 2524ba06a2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2387904
Change-Id: Ifb3e49e4b717c203522df86f9b1e0c46f30b0f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/support/Android.bp b/security/keymint/support/Android.bp
index ce72c81..1a8695b 100644
--- a/security/keymint/support/Android.bp
+++ b/security/keymint/support/Android.bp
@@ -67,7 +67,7 @@
"android.hardware.security.rkp-V3-ndk",
],
whole_static_libs: [
- "libcert_request_validator_cxx",
+ "libhwtrust_cxx",
],
shared_libs: [
"libbase",
diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp
index 3d8de28..9620b6a 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -23,8 +23,8 @@
#include <aidl/android/hardware/security/keymint/RpcHardwareInfo.h>
#include <android-base/properties.h>
-#include <cert_request_validator/cert_request_validator.h>
#include <cppbor.h>
+#include <hwtrust/hwtrust.h>
#include <json/json.h>
#include <keymaster/km_openssl/ec_key.h>
#include <keymaster/km_openssl/ecdsa_operation.h>
@@ -292,7 +292,7 @@
ErrMsgOr<std::vector<BccEntryData>> validateBcc(const cppbor::Array* bcc) {
auto encodedBcc = bcc->encode();
- auto chain = cert_request_validator::DiceChain::verify(encodedBcc);
+ auto chain = hwtrust::DiceChain::verify(encodedBcc);
if (!chain.ok()) return chain.error().message();
auto keys = chain->cose_public_keys();
if (!keys.ok()) return keys.error().message();