Merge "Remove unnecessary "_external" suffix from libcppbor" into main

2024-04-01 18:50:02 +00:00
parent b95370a746 688a572357
commit 670a481e6f
3 changed files with 3 additions and 3 deletions
--- a/libwvdrmengine/factory_upload_tool/Android.bp
+++ b/libwvdrmengine/factory_upload_tool/Android.bp
@@ -26,7 +26,7 @@ cc_binary {
        "android.hardware.security.rkp-V3-ndk",
        "libbase",
        "libbinder_ndk",
-        "libcppbor_external",
+        "libcppbor",
        "libcrypto",
        "libkeymaster_portable",
        "libkeymint",
--- a/libwvdrmengine/oemcrypto/test/common.mk
+++ b/libwvdrmengine/oemcrypto/test/common.mk
@@ -62,7 +62,7 @@ LOCAL_STATIC_LIBRARIES := \

 LOCAL_SHARED_LIBRARIES := \
  libbase \
-  libcppbor_external \
+  libcppbor \
  libcrypto \
  libdl \
  libbinder_ndk \
--- a/libwvdrmengine/tools/factory_upload_tool/Android.bp
+++ b/libwvdrmengine/tools/factory_upload_tool/Android.bp
@@ -20,7 +20,7 @@ cc_binary {
    ],
    shared_libs: [
        "libbase",
-        "libcppbor_external",
+        "libcppbor",
        "libcppcose_rkp",
        "libcrypto",
        "liblog",