Changing libcppbor dependency
This change replaces libcppbor with libcppbor_external as part of the
effort to remove the partial libcppbor copy that lives in
hardware/interfaces.
Bug: 182445123
Test: It builds
Change-Id: I9c96cdf807979ecf806c80edd3cec9c443294c22
diff --git a/identity/Android.bp b/identity/Android.bp
index d66f4ec..8267a6b 100644
--- a/identity/Android.bp
+++ b/identity/Android.bp
@@ -42,6 +42,7 @@
"libbinder_ndk",
"android.hardware.keymaster@4.0",
"libcredstore_aidl",
+ "libcrypto",
"libutils",
"libhidlbase",
"android.hardware.identity-support-lib",
@@ -53,7 +54,7 @@
static_libs: [
"android.hardware.identity-V3-cpp",
"android.hardware.keymaster-V3-cpp",
- "libcppbor",
+ "libcppbor_external",
]
}
diff --git a/identity/CredentialData.cpp b/identity/CredentialData.cpp
index d95c1ac..74b995d 100644
--- a/identity/CredentialData.cpp
+++ b/identity/CredentialData.cpp
@@ -273,7 +273,7 @@
}
for (size_t n = 0; n < map->size(); n++) {
- auto [keyItem, valueItem] = (*map)[n];
+ auto& [keyItem, valueItem] = (*map)[n];
const cppbor::Tstr* tstr = keyItem->asTstr();
if (tstr == nullptr) {
LOG(ERROR) << "Key item in top-level map is not a tstr";
@@ -325,7 +325,7 @@
return false;
}
for (size_t m = 0; m < map->size(); m++) {
- auto [ecKeyItem, ecValueItem] = (*map)[m];
+ auto& [ecKeyItem, ecValueItem] = (*map)[m];
const cppbor::Tstr* ecTstr = ecKeyItem->asTstr();
if (ecTstr == nullptr) {
LOG(ERROR) << "Key item in encryptedChunks map is not a tstr";