emerald-vendor: Use Fenrir LK and sync changes from trees

Signed-off-by: vannashcroft <vannashcroft@proton.me>
This commit is contained in:
2026-07-16 18:07:08 +00:00
parent c63f7d6268
commit 627a225961
12 changed files with 68 additions and 30 deletions
+36 -4
View File
@@ -1500,7 +1500,7 @@ cc_prebuilt_library_shared {
}
cc_prebuilt_library_shared {
name: "android.hardware.security.keymint-V3-ndk-v34",
name: "android.hardware.security.keymint-V3-ndk-v35",
owner: "xiaomi",
strip: {
none: true,
@@ -1508,7 +1508,7 @@ cc_prebuilt_library_shared {
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so",
"proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v35.so",
],
shared_libs: [
"libbinder_ndk",
@@ -2032,7 +2032,6 @@ cc_prebuilt_library_shared {
"libcutils",
"libbase",
"libz",
"arm.graphics-V1-ndk_platform",
"android.hardware.graphics.mapper@4.0",
"libgralloctypes",
"libhidlbase",
@@ -33970,6 +33969,30 @@ cc_prebuilt_library_shared {
system_ext_specific: true,
}
android_app_import {
name: "HotwordEnrollmentOKGoogleRISCV",
owner: "xiaomi",
apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleRISCV/HotwordEnrollmentOKGoogleRISCV.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
privileged: true,
product_specific: true,
}
android_app_import {
name: "HotwordEnrollmentXGoogleRISCV",
owner: "xiaomi",
apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV/HotwordEnrollmentXGoogleRISCV.apk",
certificate: "platform",
dex_preopt: {
enabled: false,
},
privileged: true,
product_specific: true,
}
android_app_import {
name: "EngineerMode",
owner: "xiaomi",
@@ -33981,6 +34004,15 @@ android_app_import {
system_ext_specific: true,
}
dex_import {
name: "com.android.hotwordenrollment.common.util",
owner: "xiaomi",
jars: [
"proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar",
],
system_ext_specific: true,
}
prebuilt_etc_xml {
name: "android.hardware.neuralnetworks-shim-service-mtk.xml",
owner: "xiaomi",
@@ -34411,7 +34443,7 @@ cc_prebuilt_binary {
"libhardware",
"libhidlbase",
"android.hardware.keymaster@4.0",
"android.hardware.security.keymint-V3-ndk-v34",
"android.hardware.security.keymint-V3-ndk-v35",
"android.hardware.security.sharedsecret-V1-ndk",
"android.hardware.security.secureclock-V1-ndk",
"lib_android_keymaster_keymint_utils",