diff --git a/Android.bp b/Android.bp index 472d875..b698299 100644 --- a/Android.bp +++ b/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", diff --git a/Android.mk b/Android.mk index aca89dc..e77817e 100644 --- a/Android.mk +++ b/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) diff --git a/klee-vendor.mk b/klee-vendor.mk index d3f9175..4ff9c08 100644 --- a/klee-vendor.mk +++ b/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 \ diff --git a/proprietary/odm/lib64/libgoogleid.so b/proprietary/odm/lib64/libgoogleid.so index 68dccb5..f2d139e 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..54e21b6 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..c0f8fed 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/etc/permissions/android.hardware.hardware_keystore.mitee.xml b/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml deleted file mode 100644 index 4c75596..0000000 --- a/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so b/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v36.so similarity index 99% rename from proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so rename to proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v36.so index f3c41a9..8d99a86 100644 Binary files a/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so and b/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v36.so differ diff --git a/radio/lk.img b/radio/lk.img index 709ccf7..df5f536 100644 Binary files a/radio/lk.img and b/radio/lk.img differ