From 94b73561955669bc51d14502a090829bd3288d9f Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 4 Jul 2026 14:40:37 +0200 Subject: [PATCH] tanzanite: Sync with device tree Signed-off-by: Nathan --- Android.bp | 6 +++--- Android.mk | 2 +- ...ardware.security.keymint@1.0-service.mitee | Bin 148777 -> 148777 bytes ...droid.hardware.hardware_keystore.mitee.xml | 18 ------------------ ...d.hardware.security.keymint-V3-ndk-v35.so} | Bin 219321 -> 219321 bytes radio/lk.img | Bin 2859008 -> 2859296 bytes tanzanite-vendor.mk | 3 +-- 7 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml rename proprietary/vendor/lib64/{android.hardware.security.keymint-V3-ndk-v34.so => android.hardware.security.keymint-V3-ndk-v35.so} (99%) 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 94745953b5e820d1cc45949dbb2c1166a0e1f04e..bd028568cfd668504e0e5907121bfb9e0607cde4 100755 GIT binary patch delta 21 ccmZ44#ksPJv!R7?3sbrSqv`ex2d0B809NY - - - - 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 631427aa8d9c04d6de37c4649d30451c99714694..ee93af60abbdf51d7f0d09fae825ca48bac460f0 100644 GIT binary patch delta 26 ecmdnFk$2}t-i8*&7N#xC>m#^K^@{TuzyJV+g$IWK delta 26 ecmdnFk$2}t-i8*&7N#xC>m#^K^osKtzyJV+dk2O9 diff --git a/radio/lk.img b/radio/lk.img index 9560bc6ab849ec60af097e1b34cf47e9ae8d0c0f..7185c5aaaae04a82536415ae28a6029036507660 100644 GIT binary patch delta 670 zcmZoTu#R!Tp>>QKHiWV8F))Zsuel|oF!@TD4NLz2|Kii{+>%jgwg_*x2xr`G5zdt2 z%)-FX5Hx+kEG7jotNq9x)NueY zClGUO52)i_@_|zs=z!$Zq7tL&iQBlPw@c*n++bu{5HX#q*~EC$5lKr8{ol0YoA{Y;|t zixoJ%a-L5H;+5qZLiOD>>%U&mKXsyN#R}c2ulRaX!f!r5__3kzz`DTp?HhPxfL^H* zkO5*@AeIASc_3EUUL~OTx*6sbNJK1{qS&wjkAHkzm9Y88r(UVur(PL|Re)F(h}D2t zeY;P+Mut0XKb+El_#sRD`m+x`+RqABU8*X}x$YUVLMO6yrPx}JH#S}$jwpZFzTt!h R$PZ^UfLL>T)fug}%K&K*0c8LH delta 467 zcmZ2*XdPq2fpv@B_F1%OwzX5ZjjG&fN{IR6z$K9+ii<^?lQJ3l=1*EFA(zqF+UIsY*#21T&V-I zd^^x`gEp|e(}DI%Y}e5c`e2D+dAm-M5D*Iku?P^009GxqZP|t%l10kbbhp 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 \