klee: Add fenrir support

Signed-off-by: kylieeXD <khayloaftck@gmail.com>

Android.bp

@@ -191,7 +191,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "android.hardware.security.keymint-V3-ndk-v34",
+    name: "android.hardware.security.keymint-V3-ndk-v36",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -199,7 +199,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-v36.so",
             ],
             shared_libs: [
                 "libbinder_ndk",
@@ -36205,7 +36205,7 @@ cc_prebuilt_library_shared {
                 "libkeymint",
                 "libkeymint_support",
                 "libkeymint_remote_prov_support",
-                "android.hardware.security.keymint-V3-ndk-v34",
+                "android.hardware.security.keymint-V3-ndk-v36",
                 "android.hardware.secure_element-V1-ndk",
                 "libc++",
                 "libc",
@@ -37067,7 +37067,7 @@ cc_prebuilt_library_shared {
                 "libkeymint",
                 "libkeymaster_messages",
                 "libkeymint_support",
-                "android.hardware.security.keymint-V3-ndk-v34",
+                "android.hardware.security.keymint-V3-ndk-v36",
                 "libkeymint_remote_prov_support",
                 "libmisight",
                 "libc++",
@@ -38717,7 +38717,7 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/hw/android.hardware.security.keymint@3.0-service.mitee",
             ],
             shared_libs: [
-                "android.hardware.security.keymint-V3-ndk-v34",
+                "android.hardware.security.keymint-V3-ndk-v36",
                 "libteecli",
                 "libhidlbase",
                 "android.hardware.security.rkp-V3-ndk",

Android.mk

@@ -15,7 +15,7 @@ $(call add-radio-file-sha1-checked,radio/connsys_wifi.img,8b9a7baf2541be6637da55
 $(call add-radio-file-sha1-checked,radio/dpm.img,7cbb75a4fe46d93b4f37ea486c2ca672080956ce)
 $(call add-radio-file-sha1-checked,radio/gpueb.img,c6768caf48850468e44ac5178a0a453fad7b4047)
 $(call add-radio-file-sha1-checked,radio/gz.img,87fa615c7586c56251689b86c6cbf4d736e90680)
-$(call add-radio-file-sha1-checked,radio/lk.img,5bb2e57636d0ac263dc29a73740dee82473825ce)
+$(call add-radio-file-sha1-checked,radio/lk.img,8daa12bb697144e3e08e5af9cb29f94e66b174af)
 $(call add-radio-file-sha1-checked,radio/logo.img,30ae0231b348a78c8bb9ae9c08d7aae48ca65685)
 $(call add-radio-file-sha1-checked,radio/mcf_ota.img,e421d5b21b9cc20de71de1ccfb8174224e901e27)
 $(call add-radio-file-sha1-checked,radio/mcupm.img,86e34add1842a12d8696f8c57c5c849ec9b584ec)

klee-vendor.mk

@@ -737,7 +737,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/klee/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \
     vendor/xiaomi/klee/proprietary/vendor/etc/p10_36_02_0a_dsc_vdo_dbi.bin:$(TARGET_COPY_OUT_VENDOR)/etc/p10_36_02_0a_dsc_vdo_dbi.bin \
     vendor/xiaomi/klee/proprietary/vendor/etc/p10_42_02_0b_dsc_vdo_dbi.bin:$(TARGET_COPY_OUT_VENDOR)/etc/p10_42_02_0b_dsc_vdo_dbi.bin \
-    vendor/xiaomi/klee/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/permissions/android.hardware.identity_credential.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.identity_credential.mitee.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/permissions/camera_extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/camera_extensions.xml \
     vendor/xiaomi/klee/proprietary/vendor/etc/pq_flag.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pq_flag.xml \
@@ -1117,7 +1116,7 @@ PRODUCT_PACKAGES += \
     APUWareUtilsAidlServer \
     android.hardware.audio.core-impl-mediatek \
     android.hardware.bluetooth.audio-impl-mediatek \
-    android.hardware.security.keymint-V3-ndk-v34 \
+    android.hardware.security.keymint-V3-ndk-v36 \
     com.xiaomi.camdfx \
     com.xiaomi.camhal.extmodel.ec_executor \
     com.xiaomi.camhal.extmodel.intent_aware_sys \

proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<permissions>
-  <feature name="android.hardware.hardware_keystore" version="300" />
-</permissions>