From 84c68f0167714ee0b69850d51a136e07ec2c8422 Mon Sep 17 00:00:00 2001 From: ChrisCatto Date: Fri, 3 Oct 2025 18:07:15 +0200 Subject: [PATCH] m34x: Refactor keymint service patching * There is an issue with keymint V4 NDK in our device because of some changes to keystore2 related to setAdditionalAttestationInfo and after Android 16 release and it seems like we cannot boot by keep using it. Downgrading keymint NDK to V3 allows us to boot again. * However, by doing this, checkelf must be disabled for keymint service the same goes for dependencies generation in Android.bp (for this service only). Change-Id: Iefdb624502ca9bd78881c0e542a2a8f5584a8be7 Signed-off-by: ChrisCatto Signed-off-by: Majaahh --- Android.bp | 23 +----------------- ....hardware.security.keymint-service.samsung | Bin 201465 -> 201465 bytes 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Android.bp b/Android.bp index f964503..3585ece 100644 --- a/Android.bp +++ b/Android.bp @@ -441,31 +441,10 @@ cc_prebuilt_binary { srcs: [ "proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung", ], - shared_libs: [ - "libshim_crypto", - "android.hardware.security.rkp-V3-ndk", - "libskeymint10device", - "vendor.samsung.hardware.keymint-V1-ndk_platform", - "android.hardware.security.keymint-V4-ndk", - "android.hardware.security.sharedsecret-V1-ndk", - "android.hardware.security.secureclock-V1-ndk", - "libbase", - "libbinder_ndk", - "libcppbor_external", - "libcrypto-tm", - "libkeymaster_portable", - "libkeymint", - "liblog", - "libpuresoftkeymasterdevice", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], }, }, compile_multilib: "64", + check_elf_files: false, strip: { none: true, }, diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung index cf8061f2f9c236620336449d045cc4cf6de58992..6f0663c96ff7183781d1ca35428acc373296967c 100755 GIT binary patch delta 23 ecmeyll;`JCo`x327N#xC-GYq9+j|6=a~T14e+Vo9 delta 23 ecmeyll;`JCo`x327N#xC-GYoJ+j|6=a~T14h6pVH