diff --git a/Android.bp b/Android.bp index 513815b..44f6ce2 100644 --- a/Android.bp +++ b/Android.bp @@ -190,32 +190,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "android.hardware.security.keymint-V3-ndk-v34", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so", - ], - shared_libs: [ - "libbinder_ndk", - "android.hardware.security.secureclock-V1-ndk", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "com.xiaomi.camdfx", owner: "xiaomi", @@ -3234,6 +3208,31 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libbase-v35", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libbase-v35.so", + ], + shared_libs: [ + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libbessound_hd_mtk_vendor", owner: "xiaomi", @@ -6538,6 +6537,78 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libkeymint_V3", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libkeymint_V3.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk", + "libhidlbase", + "android.hardware.security.rkp-V3-ndk", + "android.hardware.security.secureclock-V1-ndk", + "android.hardware.security.sharedsecret-V1-ndk", + "lib_android_keymaster_keymint_utils_V3", + "libbase", + "libbinder_ndk", + "libcppbor", + "libcrypto", + "libcutils", + "libkeymaster_messages", + "libkeymaster_portable", + "liblog", + "libpuresoftkeymasterdevice", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libkeymint_remote_prov_support_V3", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libkeymint_remote_prov_support_V3.so", + ], + shared_libs: [ + "android.hardware.security.keymint-V3-ndk", + "libbase-v35", + "libbinder_ndk", + "libcppbor", + "libcppcose_rkp", + "libcrypto", + "libkeymaster_portable", + "libjsoncpp", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libladder", owner: "xiaomi", @@ -34638,12 +34709,12 @@ cc_prebuilt_library_shared { "liboemcrypto", "libhardware", "libkeymaster4support", - "lib_android_keymaster_keymint_utils", - "libkeymint", + "lib_android_keymaster_keymint_utils_V3", + "libkeymint_V3", "libkeymaster_messages", - "libkeymint_support", - "android.hardware.security.keymint-V3-ndk-v34", - "libkeymint_remote_prov_support", + "libkeymint_support_V3", + "android.hardware.security.keymint-V3-ndk", + "libkeymint_remote_prov_support_V3", "libbase", "libbinder", "android.hardware.secure_element-V1-ndk", @@ -36253,19 +36324,19 @@ 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", "libteecli", "libhidlbase", "android.hardware.security.rkp-V3-ndk", "android.hardware.security.secureclock-V1-ndk", "android.hardware.security.sharedsecret-V1-ndk", - "lib_android_keymaster_keymint_utils", + "lib_android_keymaster_keymint_utils_V3", "libbase", "libbinder_ndk", "libcrypto", "libhardware", "libkeymaster_messages", - "libkeymint", + "libkeymint_V3", "liblog", "libtrusty", "libutils", diff --git a/Android.mk b/Android.mk index 90f9100..b2e49ab 100644 --- a/Android.mk +++ b/Android.mk @@ -15,7 +15,7 @@ $(call add-radio-file-sha1-checked,radio/connsys_wifi.img,9e51ff970c2937debf5a75 $(call add-radio-file-sha1-checked,radio/dpm.img,72b64df491665ebaffb22244f234cb3cd7c61db3) $(call add-radio-file-sha1-checked,radio/gpueb.img,f521d1f083fecc3ff41b0ae3bd8f404bf57165df) $(call add-radio-file-sha1-checked,radio/gz.img,bd5ef2ee03fedee555e6f2c6f7ce9f2c8ed95e14) -$(call add-radio-file-sha1-checked,radio/lk.img,4646383b49a4f44661c9597b7dc589cc92b4f229) +$(call add-radio-file-sha1-checked,radio/lk.img,a7e8d5b66a64fbd4de5c55d162529b55f15b0161) $(call add-radio-file-sha1-checked,radio/mcf_ota.img,6fbd06c64109b15912ba83ec9ae54f8e41fbb644) $(call add-radio-file-sha1-checked,radio/mcupm.img,f87b41fef305ad522b2e3d6ac5e4fe236fcc652e) $(call add-radio-file-sha1-checked,radio/modem.img,1bec11db445bfe19faa342190ca6015d9f86fa90) diff --git a/proprietary/odm/lib64/libmt_mitee.so b/proprietary/odm/lib64/libmt_mitee.so index 02de757..a91a2c1 100644 Binary files a/proprietary/odm/lib64/libmt_mitee.so and b/proprietary/odm/lib64/libmt_mitee.so differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk index 2bc258f..314d62a 100644 Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk index 28976a0..e98303c 100644 Binary files a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk and b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar index e4ebe4e..b09df01 100644 Binary files a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar and b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar 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 aa41844..6e67485 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-v34.so deleted file mode 100644 index f3c41a9..0000000 Binary files a/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libbase-v35.so b/proprietary/vendor/lib64/libbase-v35.so new file mode 100644 index 0000000..8f2d4d4 Binary files /dev/null and b/proprietary/vendor/lib64/libbase-v35.so differ diff --git a/proprietary/vendor/lib64/libkeymint_V3.so b/proprietary/vendor/lib64/libkeymint_V3.so new file mode 100644 index 0000000..3f0409c Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint_V3.so differ diff --git a/proprietary/vendor/lib64/libkeymint_remote_prov_support_V3.so b/proprietary/vendor/lib64/libkeymint_remote_prov_support_V3.so new file mode 100644 index 0000000..cf49243 Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint_remote_prov_support_V3.so differ diff --git a/radio/lk.img b/radio/lk.img old mode 100755 new mode 100644 index 101a4fc..793becd Binary files a/radio/lk.img and b/radio/lk.img differ diff --git a/rodin-vendor.mk b/rodin-vendor.mk index 2194492..5e906dc 100644 --- a/rodin-vendor.mk +++ b/rodin-vendor.mk @@ -658,7 +658,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/video_aisr/2.0x/mtk_AISR_D1_Q8_dynamic_1k_8b_p.dla:$(TARGET_COPY_OUT_VENDOR)/etc/nn/video_aisr/2.0x/mtk_AISR_D1_Q8_dynamic_1k_8b_p.dla \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/video_aisr/resolution_settings.json:$(TARGET_COPY_OUT_VENDOR)/etc/nn/video_aisr/resolution_settings.json \ vendor/xiaomi/rodin/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \ - vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/android.hardware.identity_credential.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.identity_credential.mitee.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/camera_extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/camera_extensions.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/pq_flag.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pq_flag.xml \ @@ -811,7 +810,6 @@ PRODUCT_PACKAGES += \ APUWareUtilsAidlServer \ android.hardware.audio.core-impl-mediatek \ android.hardware.bluetooth.audio-impl-mediatek \ - android.hardware.security.keymint-V3-ndk-v34 \ com.xiaomi.camdfx \ com.xiaomi.immunesystem.bigdata \ com.xiaomi.immunesystem.bigdata2 \ @@ -908,6 +906,7 @@ PRODUCT_PACKAGES += \ libaudiotoolkit_vendor \ libaurisysdemo \ libawinicsmartpaparse \ + libbase-v35 \ libbessound_hd_mtk_vendor \ libblisrc32_vendor \ libbluetooth_audio_session_aidl_mtk \ @@ -1013,6 +1012,8 @@ PRODUCT_PACKAGES += \ libjpeg-alpha_vendor \ libjpegdecoder_rodin \ libjpegencoder_rodin \ + libkeymint_V3 \ + libkeymint_remote_prov_support_V3 \ libladder \ libmbrainSDKv \ libmcve \