diff --git a/Android.bp b/Android.bp index 7d173a8..c8d5ab2 100644 --- a/Android.bp +++ b/Android.bp @@ -1500,7 +1500,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, @@ -1508,7 +1508,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", @@ -2032,7 +2032,6 @@ cc_prebuilt_library_shared { "libcutils", "libbase", "libz", - "arm.graphics-V1-ndk_platform", "android.hardware.graphics.mapper@4.0", "libgralloctypes", "libhidlbase", @@ -33970,6 +33969,30 @@ cc_prebuilt_library_shared { system_ext_specific: true, } +android_app_import { + name: "HotwordEnrollmentOKGoogleRISCV", + owner: "xiaomi", + apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleRISCV/HotwordEnrollmentOKGoogleRISCV.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "HotwordEnrollmentXGoogleRISCV", + owner: "xiaomi", + apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV/HotwordEnrollmentXGoogleRISCV.apk", + certificate: "platform", + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + android_app_import { name: "EngineerMode", owner: "xiaomi", @@ -33981,6 +34004,15 @@ android_app_import { system_ext_specific: true, } +dex_import { + name: "com.android.hotwordenrollment.common.util", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar", + ], + system_ext_specific: true, +} + prebuilt_etc_xml { name: "android.hardware.neuralnetworks-shim-service-mtk.xml", owner: "xiaomi", @@ -34411,7 +34443,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 69c66cd..899fefd 100644 --- a/Android.mk +++ b/Android.mk @@ -8,7 +8,7 @@ ifeq ($(TARGET_DEVICE),emerald) $(call add-radio-file-sha1-checked,radio/dpm.img,c6a1ccd25506ddd4bde8f5ae424f4dc85d76d3b2) $(call add-radio-file-sha1-checked,radio/gz.img,ae714d5ca3515a323ddde065ebb39cf7311d9799) -$(call add-radio-file-sha1-checked,radio/lk.img,b8cb26bce36bbf1f19edcfd69fb54214bae498f9) +$(call add-radio-file-sha1-checked,radio/lk.img,b6eef4fdd3d8174897dcbb170d8f92d214f5140d) $(call add-radio-file-sha1-checked,radio/mcupm.img,a424a4a11e9ef48af104466c6fce6bebf95f1d9c) $(call add-radio-file-sha1-checked,radio/md1img.img,c95cab1897d14f6fa83bab65ad811b8750ee6239) $(call add-radio-file-sha1-checked,radio/pi_img.img,c2234f9da77319f4b831e1d3a35d6910f69c4263) diff --git a/emerald-vendor.mk b/emerald-vendor.mk index d57a49c..6aa673d 100644 --- a/emerald-vendor.mk +++ b/emerald-vendor.mk @@ -7,6 +7,7 @@ PRODUCT_SOONG_NAMESPACES += \ PRODUCT_COPY_FILES += \ vendor/xiaomi/emerald/proprietary/odm/etc/camera/camerabooster.json:$(TARGET_COPY_OUT_ODM)/etc/camera/camerabooster.json \ + vendor/xiaomi/emerald/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \ vendor/xiaomi/emerald/proprietary/vendor/etc/AbnormalDisplayLog_dynamic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/AbnormalDisplayLog_dynamic.xml \ vendor/xiaomi/emerald/proprietary/vendor/etc/AudioLog_dynamic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/AudioLog_dynamic.xml \ vendor/xiaomi/emerald/proprietary/vendor/etc/MNL_Config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/MNL_Config.xml \ @@ -546,7 +547,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/emerald/proprietary/vendor/etc/misound_res_spk.bin:$(TARGET_COPY_OUT_VENDOR)/etc/misound_res_spk.bin \ vendor/xiaomi/emerald/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ vendor/xiaomi/emerald/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \ - vendor/xiaomi/emerald/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \ vendor/xiaomi/emerald/proprietary/vendor/etc/rsc/default/ro.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/default/ro.prop \ vendor/xiaomi/emerald/proprietary/vendor/etc/rsc/default/rw.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/default/rw.prop \ vendor/xiaomi/emerald/proprietary/vendor/etc/rsc/glb/ro.prop:$(TARGET_COPY_OUT_VENDOR)/etc/rsc/glb/ro.prop \ @@ -761,7 +761,7 @@ PRODUCT_PACKAGES += \ APUWareApusysServer \ APUWareHmpServer \ APUWareUtilsServer \ - android.hardware.security.keymint-V3-ndk-v34 \ + android.hardware.security.keymint-V3-ndk-v35 \ awinic.audio.effect \ com.xiaomi.plugin.capbokeh \ com.xiaomi.plugin.ldc \ @@ -1910,7 +1910,10 @@ PRODUCT_PACKAGES += \ libem_bleoffload_jni \ libem_support_jni \ libem_wifi_jni \ + HotwordEnrollmentOKGoogleRISCV \ + HotwordEnrollmentXGoogleRISCV \ EngineerMode \ + com.android.hotwordenrollment.common.util \ android.hardware.neuralnetworks-shim-service-mtk.xml \ android.hardware.security.keymint-service.mitee.xml \ android.hardware.security.secureclock-service.mitee.xml \ diff --git a/proprietary/product/priv-app/HotwordEnrollmentOKGoogleRISCV/HotwordEnrollmentOKGoogleRISCV.apk b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleRISCV/HotwordEnrollmentOKGoogleRISCV.apk new file mode 100644 index 0000000..33cfc08 Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentOKGoogleRISCV/HotwordEnrollmentOKGoogleRISCV.apk differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV/HotwordEnrollmentXGoogleRISCV.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV/HotwordEnrollmentXGoogleRISCV.apk new file mode 100644 index 0000000..3ead6a2 Binary files /dev/null and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV/HotwordEnrollmentXGoogleRISCV.apk differ diff --git a/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml b/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml new file mode 100644 index 0000000..91a8eec --- /dev/null +++ b/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar new file mode 100644 index 0000000..28f0ef6 Binary files /dev/null and b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar differ 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-v34.so deleted file mode 100644 index 8b262be..0000000 --- a/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v34.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:657abca463926e717f89ac56e0d09236de7bba0680f2e1f1111b0b447bd3da95 -size 219321 diff --git a/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v35.so b/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v35.so new file mode 100644 index 0000000..f5fce53 --- /dev/null +++ b/proprietary/vendor/lib64/android.hardware.security.keymint-V3-ndk-v35.so @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ede41df9940445c36a20b372c318f740ed7d13e04367b015242d967a3d759aa +size 219321 diff --git a/radio/lk.img b/radio/lk.img old mode 100755 new mode 100644 index 47112b3..eb78ec9 --- a/radio/lk.img +++ b/radio/lk.img @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6eb61c65221f8c131eb21aebf1f878e83b3c21415928157fd6f8e179b4379660 -size 2777088 +oid sha256:a4f7293bf3c8a2b215fddfbe7b2a25502d1997c0f1fdbcecd0ba75c548ec0d36 +size 2777216