diff --git a/Android.bp b/Android.bp index 5330178..8a982e2 100644 --- a/Android.bp +++ b/Android.bp @@ -2698,6 +2698,33 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "lib_android_keymaster_keymint_utils-v34", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/lib_android_keymaster_keymint_utils-v34.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk-v34", + "libbase", + "libhardware", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "lib_iir", owner: "xiaomi", @@ -7546,6 +7573,108 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libkeymint-v34", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libkeymint-v34.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk-v34", + "libhidlbase", + "android.hardware.security.rkp-V3-ndk", + "android.hardware.security.secureclock-V1-ndk", + "android.hardware.security.sharedsecret-V1-ndk", + "lib_android_keymaster_keymint_utils-v34", + "libbase", + "libbinder_ndk", + "libcppbor", + "libcrypto", + "libcutils", + "libkeymaster_messages", + "libkeymaster_portable", + "liblog", + "libpuresoftkeymasterdevice", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libkeymint_remote_prov_support-v34", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libkeymint_remote_prov_support-v34.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk-v34", + "libbase", + "libbinder_ndk", + "libcppbor", + "libcppcose_rkp", + "libcrypto", + "libkeymaster_portable", + "libjsoncpp", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + check_elf_files: false, + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libkeymint_support-v34", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libkeymint_support-v34.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk-v34", + "libbase", + "libcrypto", + "libutils", + "libhardware", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libladder", owner: "xiaomi", @@ -36199,12 +36328,12 @@ cc_prebuilt_library_shared { "libxml2", "vendor.xiaomi.hardware.idmanager-V1-ndk", "libkeymaster_messages", - "lib_android_keymaster_keymint_utils", + "lib_android_keymaster_keymint_utils-v34", "libhardware", "libkeymaster4support", - "libkeymint", - "libkeymint_support", - "libkeymint_remote_prov_support", + "libkeymint-v34", + "libkeymint_support-v34", + "libkeymint_remote_prov_support-v34", "android.hardware.security.keymint-V3-ndk-v34", "android.hardware.secure_element-V1-ndk", "libc++", @@ -37063,12 +37192,12 @@ cc_prebuilt_library_shared { "vendor.xiaomi.hardware.idmanager-V1-ndk", "libhardware", "libkeymaster4support", - "lib_android_keymaster_keymint_utils", - "libkeymint", + "lib_android_keymaster_keymint_utils-v34", + "libkeymint-v34", "libkeymaster_messages", - "libkeymint_support", + "libkeymint_support-v34", "android.hardware.security.keymint-V3-ndk-v34", - "libkeymint_remote_prov_support", + "libkeymint_remote_prov_support-v34", "libmisight", "libc++", "libc", @@ -38724,13 +38853,13 @@ cc_prebuilt_binary { "android.hardware.security.rkp-V3-ndk", "android.hardware.security.secureclock-V1-ndk", "android.hardware.security.sharedsecret-V1-ndk", - "lib_android_keymaster_keymint_utils", + "lib_android_keymaster_keymint_utils-v34", "libbase", "libbinder_ndk", "libcrypto", "libhardware", "libkeymaster_messages", - "libkeymint", + "libkeymint-v34", "liblog", "libtrusty", "libutils", diff --git a/klee-vendor.mk b/klee-vendor.mk index eff5794..ff67a87 100644 --- a/klee-vendor.mk +++ b/klee-vendor.mk @@ -979,6 +979,7 @@ PRODUCT_PACKAGES += \ libSQLiteModule_VER_ALL \ libXMFaceFocus-vendor \ libXMFaceFocus1206 \ + lib_android_keymaster_keymint_utils-v34 \ lib_iir \ libaaa_aaautil \ libaaa_afassist_V2 \ @@ -1137,6 +1138,9 @@ PRODUCT_PACKAGES += \ libjpeg-alpha_vendor \ libjpegdecoder_klee \ libjpegencoder_klee \ + libkeymint-v34 \ + libkeymint_remote_prov_support-v34 \ + libkeymint_support-v34 \ libladder \ libmbrainSDKv \ libmcve \ diff --git a/proprietary/odm/lib64/libgoogleid.so b/proprietary/odm/lib64/libgoogleid.so index 68dccb5..5cc8728 100644 Binary files a/proprietary/odm/lib64/libgoogleid.so and b/proprietary/odm/lib64/libgoogleid.so differ diff --git a/proprietary/odm/lib64/libmt_mitee.so b/proprietary/odm/lib64/libmt_mitee.so index 9fb0364..917f71b 100644 Binary files a/proprietary/odm/lib64/libmt_mitee.so and b/proprietary/odm/lib64/libmt_mitee.so differ diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee b/proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee index fd218af..c365b82 100755 Binary files a/proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee and b/proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee differ diff --git a/proprietary/vendor/lib64/lib_android_keymaster_keymint_utils-v34.so b/proprietary/vendor/lib64/lib_android_keymaster_keymint_utils-v34.so new file mode 100644 index 0000000..c1c79fe Binary files /dev/null and b/proprietary/vendor/lib64/lib_android_keymaster_keymint_utils-v34.so differ diff --git a/proprietary/vendor/lib64/libkeymint-v34.so b/proprietary/vendor/lib64/libkeymint-v34.so new file mode 100644 index 0000000..02bd80e Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint-v34.so differ diff --git a/proprietary/vendor/lib64/libkeymint_remote_prov_support-v34.so b/proprietary/vendor/lib64/libkeymint_remote_prov_support-v34.so new file mode 100644 index 0000000..9da6bfc Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint_remote_prov_support-v34.so differ diff --git a/proprietary/vendor/lib64/libkeymint_support-v34.so b/proprietary/vendor/lib64/libkeymint_support-v34.so new file mode 100644 index 0000000..e8c2977 Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint_support-v34.so differ