commit b96840b68f12d2d3c47d7a55e3801e630ba81fd0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 29 21:46:07 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 29 21:46:07 2024 +0000
tree 42ea12d5f7f45d925c87cc55eba1c11812f1cd21
parent ad1622d2a7c7fa9566c41bbebdf0be3d0368db3f
parent 21d14328fdb5578be47c740eeb0d2d42713b5cec

Merge "Remove unnecessary "_external" suffix from libcppbor" into main am: 2fc36745c1 am: 21d14328fd

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3019167

Change-Id: Ida6789dfee322c743fc530c32ce08b40ed43fed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

identity/Android.bp

diff --git a/identity/Android.bp b/identity/Android.bp
index 6227bfe..a563532 100644
--- a/identity/Android.bp
+++ b/identity/Android.bp
@@ -59,7 +59,7 @@
         "android.hardware.identity-support-lib",
         "android.hardware.security.rkp-V3-cpp",
         "android.security.rkp_aidl-cpp",
-        "libcppbor_external",
+        "libcppbor",
         "libcredstore_aidl",
         "libkeymaster4support",
         "librkp_support",

provisioner/Android.bp

diff --git a/provisioner/Android.bp b/provisioner/Android.bp
index d0c934d..ede1ae6 100644
--- a/provisioner/Android.bp
+++ b/provisioner/Android.bp
@@ -39,7 +39,7 @@
         "android.hardware.drm-V1-ndk",
         "android.hardware.security.rkp-V3-ndk",
         "libbase",
-        "libcppbor_external",
+        "libcppbor",
         "libcppcose_rkp",
         "libjsoncpp",
         "libkeymint_remote_prov_support",