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 <chriscatto@proton.me> Signed-off-by: Majaahh <maja.blaszczak@proton.me>
This commit is contained in:
23
Android.bp
23
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,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user