summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2024-03-28 20:42:38 -0600
committerShawn Willden <swillden@google.com>2024-03-28 20:42:38 -0600
commit65b109b10d1363f40c9b6ccd4f387bed0e05677c (patch)
treec454f096092015a2dd308f3274689a2339ed0e12
parent1de0f0905e93f9f470708288ef65c77fc84c1f36 (diff)
downloadkeymaster-65b109b10d1363f40c9b6ccd4f387bed0e05677c.tar.gz
Remove unnecessary "_external" suffix from libcppbor
Test: Build Change-Id: I490572164cdab623782f58bfb054e47ac94fe12c
-rw-r--r--Android.bp14
-rw-r--r--tests/Android.bp2
2 files changed, 8 insertions, 8 deletions
diff --git a/Android.bp b/Android.bp
index 96c6118..c4c6589 100644
--- a/Android.bp
+++ b/Android.bp
@@ -160,10 +160,10 @@ cc_library {
shared_libs: [
"libcrypto",
- "libcppbor_external",
+ "libcppbor",
"libcppcose_rkp",
],
- export_shared_lib_headers: ["libcppbor_external"],
+ export_shared_lib_headers: ["libcppbor"],
header_libs: ["libhardware_headers"],
export_header_lib_headers: ["libhardware_headers"],
defaults: ["keymaster_defaults"],
@@ -206,7 +206,7 @@ cc_library {
"libsoft_attestation_cert",
"liblog",
"libbase",
- "libcppbor_external",
+ "libcppbor",
"libcppcose_rkp",
"libcrypto",
"libcutils",
@@ -244,7 +244,7 @@ cc_library {
"libkeymaster_portable",
"libsoft_attestation_cert",
"liblog",
- "libcppbor_external",
+ "libcppbor",
"libcppcose_rkp",
"libcrypto",
"libcutils",
@@ -270,7 +270,7 @@ cc_library {
"libkeymaster_portable",
"libsoft_attestation_cert",
"liblog",
- "libcppbor_external",
+ "libcppbor",
"libcppcose_rkp",
"libcrypto",
"libcutils",
@@ -421,7 +421,7 @@ cc_library {
"lib_android_keymaster_keymint_utils",
"libbase",
"libbinder_ndk",
- "libcppbor_external",
+ "libcppbor",
"libcrypto",
"libcutils",
"libkeymaster_messages",
@@ -447,7 +447,7 @@ cc_library {
"include",
],
shared_libs: [
- "libcppbor_external",
+ "libcppbor",
"libcrypto",
"liblog",
],
diff --git a/tests/Android.bp b/tests/Android.bp
index 261ee03..09505b8 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -21,7 +21,7 @@ shared_test_libs = [
]
static_test_libs = [
- "libcppbor_external",
+ "libcppbor",
"libsoftkeymasterdevice",
"libcppcose_rkp",
]