diff --git a/Android.bp b/Android.bp index f6f449f..33dd751 100644 --- a/Android.bp +++ b/Android.bp @@ -12290,6 +12290,32 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcppbor_peridot", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcppbor_peridot.so", + ], + shared_libs: [ + "libbase", + "libcrypto", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcv_common", owner: "xiaomi", @@ -14813,7 +14839,7 @@ cc_prebuilt_library_shared { "lib_android_keymaster_keymint_utils", "libbase", "libbinder", - "libcppbor_external", + "libcppbor_peridot", "libkeymaster_portable", "libkeymaster_messages", "libsoft_attestation_cert", @@ -40064,7 +40090,7 @@ cc_prebuilt_binary { "android.se.omapi-V1-ndk", "libbase", "libbinder_ndk", - "libcppbor_external", + "libcppbor_peridot", "libcrypto", "libkeymaster_portable", "libjc_keymint_nxp", diff --git a/peridot-vendor.mk b/peridot-vendor.mk index 9581678..2210d8e 100644 --- a/peridot-vendor.mk +++ b/peridot-vendor.mk @@ -1690,6 +1690,7 @@ PRODUCT_PACKAGES += \ libcommonchiutils \ libconfigdb \ libcpion \ + libcppbor_peridot \ libcv_common \ libdapparamstorage \ libdataitems \ diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp index 1c24290..3d746ed 100755 Binary files a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp and b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.strongbox-nxp differ diff --git a/proprietary/vendor/lib64/libcppbor_peridot.so b/proprietary/vendor/lib64/libcppbor_peridot.so new file mode 100644 index 0000000..f2028fa Binary files /dev/null and b/proprietary/vendor/lib64/libcppbor_peridot.so differ diff --git a/proprietary/vendor/lib64/libjc_keymint_nxp.so b/proprietary/vendor/lib64/libjc_keymint_nxp.so index 3f045f0..52608e1 100644 Binary files a/proprietary/vendor/lib64/libjc_keymint_nxp.so and b/proprietary/vendor/lib64/libjc_keymint_nxp.so differ