diff --git a/Android.bp b/Android.bp index 5c6951f..ff802e7 100644 --- a/Android.bp +++ b/Android.bp @@ -1482,7 +1482,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, @@ -1490,7 +1490,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", @@ -29044,7 +29044,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", diff --git a/Android.mk b/Android.mk index 92dbbcf..b6ae06f 100644 --- a/Android.mk +++ b/Android.mk @@ -8,7 +8,7 @@ ifeq ($(TARGET_DEVICE),tanzanite) $(call add-radio-file-sha1-checked,radio/dpm.img,6717e8995c945dc3fdded9031b6256788f5dd1b7) $(call add-radio-file-sha1-checked,radio/gz.img,090f0d5afd2bbd65207a32961af25eb91321f867) -$(call add-radio-file-sha1-checked,radio/lk.img,2ad1a667bf14fce292dd04952b98b820db01bf3d) +$(call add-radio-file-sha1-checked,radio/lk.img,d3330b1f3fa139fbac2695555a94e5c90f4938ff) $(call add-radio-file-sha1-checked,radio/mcupm.img,743add24c773742ec7914f69ed6f78ed8e961b7d) $(call add-radio-file-sha1-checked,radio/md1img.img,4cb8ac4be7a527a979ac08b78e50d309bf630560) $(call add-radio-file-sha1-checked,radio/pi_img.img,267d35040d983cea213b4a130557cfb8b56968ad) diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint@1.0-service.mitee b/proprietary/vendor/bin/hw/android.hardware.security.keymint@1.0-service.mitee index 9474595..bd02856 100755 Binary files a/proprietary/vendor/bin/hw/android.hardware.security.keymint@1.0-service.mitee and b/proprietary/vendor/bin/hw/android.hardware.security.keymint@1.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 e5a9345..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-v35.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-v35.so index 631427a..ee93af6 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-v35.so differ diff --git a/radio/lk.img b/radio/lk.img index 9560bc6..7185c5a 100644 Binary files a/radio/lk.img and b/radio/lk.img differ diff --git a/tanzanite-vendor.mk b/tanzanite-vendor.mk index 542d67b..5868020 100644 --- a/tanzanite-vendor.mk +++ b/tanzanite-vendor.mk @@ -615,7 +615,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/meow.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/meow.cfg \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \ - vendor/xiaomi/tanzanite/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/rsc/default/ro.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/default/ro.prop \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/rsc/default/rw.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/default/rw.prop \ vendor/xiaomi/tanzanite/proprietary/vendor/etc/rsc/obsidian_eea/ro.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/obsidian_eea/ro.prop \ @@ -743,7 +742,7 @@ PRODUCT_PACKAGES += \ APUWareHmpServer \ APUWareUtilsServer \ anc.hal \ - android.hardware.security.keymint-V3-ndk-v34 \ + android.hardware.security.keymint-V3-ndk-v35 \ com.xiaomi.plugin.capbokeh \ com.xiaomi.plugin.memcpy \ com.xiaomi.plugin.mibokeh \