diff --git a/Android.bp b/Android.bp index 585d533..48a5ed3 100644 --- a/Android.bp +++ b/Android.bp @@ -6,7 +6,6 @@ soong_namespace { imports: [ "device/xiaomi/rodin", "hardware/mediatek", - "hardware/mediatek/libaedv", "hardware/mediatek/libmtkperf_client", "hardware/xiaomi", ], @@ -106,6 +105,34 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "android.frameworks.displayservice@1.0", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/android.frameworks.displayservice@1.0.so", + ], + shared_libs: [ + "libhidlbase", + "liblog", + "libutils", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "android.hardware.audio.core-impl-mediatek", owner: "xiaomi", @@ -4087,6 +4114,49 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_aidl_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so", + ], + shared_libs: [ + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "android.hardware.common-V2-ndk", + "android.hardware.media.bufferpool2-V2-ndk", + "android.hardware.media.c2-V1-ndk", + "libbase", + "libbinder_ndk", + "libcodec2", + "libcodec2_hal_common_prebuilt", + "libcodec2_vndk_prebuilt", + "libcutils", + "libhidlbase", + "liblog", + "libnativewindow", + "libstagefright_aidl_bufferpool2", + "libstagefright_bufferpool@2.0.1", + "libui", + "libutils", + "libcodec2_hidl_plugin_prebuilt", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_fsr", owner: "xiaomi", @@ -4132,6 +4202,66 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_hal_common_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so", + ], + shared_libs: [ + "libbase", + "libcodec2", + "libcodec2_vndk", + "liblog", + "libstagefright_foundation", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_hidl_plugin_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so", + ], + shared_libs: [ + "libbase", + "libcodec2", + "libcodec2_vndk_prebuilt", + "liblog", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_mtk_c2store", owner: "xiaomi", @@ -4179,62 +4309,10 @@ cc_prebuilt_library_shared { srcs: [ "proprietary/vendor/lib64/libcodec2_mtk_vdec.so", ], - shared_libs: [ - "android.hardware.media.c2-V1-ndk", - "libbinder_ndk", - "libcodec2_aidl", - "server_configurable_flags", - "libaconfig_storage_read_api_cc", - "android.hardware.media.c2@1.0", - "android.hardware.media.c2@1.1", - "android.hardware.media.c2@1.2", - "libcodec2_hidl@1.0", - "libcodec2_hidl@1.1", - "libcodec2_hidl@1.2", - "libformatter", - "libdpframework", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.media.bufferpool2-V2-ndk", - "libui", - "libgralloc_extra", - "libexpat", - "libsync", - "libhidlbase", - "libhwbinder", - "libged", - "libfmq", - "libstagefright_bufferpool@2.0.1", - "libstagefright_aidl_bufferpool2", - "libcodec2_fsr", - "libpqparamparser", - "libcodec2_hal_common", - "libcodec2_soft_common", - "libcutils", - "liblog", - "libsfplugin_ccodec_utils", - "libstagefright_foundation", - "libbase", - "libcodec2", - "libcodec2_vndk", - "libutils", - "libion", - "libdmabufheap", - "libion_mtk", - "libcodec2_mtk_c2store", - "libcodec2_vpp_qt_plugin", - "libcodec2_vpp_mi_plugin", - "libcodec2_vpp_rs_plugin", - "libcodec2_vpp_ve_plugin", - "libcodec2_vpp_frc_plugin", - "libmisight", - "libc++", - "libc", - "libm", - "libdl", - ], }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -4250,57 +4328,10 @@ cc_prebuilt_library_shared { srcs: [ "proprietary/vendor/lib64/libcodec2_mtk_venc.so", ], - shared_libs: [ - "android.hardware.media.c2-V1-ndk", - "libbinder_ndk", - "libcodec2_aidl", - "server_configurable_flags", - "libaconfig_storage_read_api_cc", - "android.hardware.media.c2@1.0", - "android.hardware.media.c2@1.1", - "android.hardware.media.c2@1.2", - "libcodec2_hidl@1.0", - "libcodec2_hidl@1.1", - "libcodec2_hidl@1.2", - "libformatter", - "libdpframework", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.media.bufferpool2-V2-ndk", - "libui", - "libgralloc_extra", - "libexpat", - "libsync", - "libhidlbase", - "libhwbinder", - "libged", - "libfmq", - "libstagefright_bufferpool@2.0.1", - "libstagefright_aidl_bufferpool2", - "libcodec2_fsr", - "libpqparamparser", - "libcodec2_hal_common", - "libcodec2_soft_common", - "libcutils", - "liblog", - "libsfplugin_ccodec_utils", - "libstagefright_foundation", - "libbase", - "libcodec2", - "libcodec2_vndk", - "libutils", - "libion", - "libdmabufheap", - "libion_mtk", - "libcodec2_mtk_c2store", - "libcodec2_vpp_fa_plugin", - "libc++", - "libc", - "libm", - "libdl", - ], }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -4414,6 +4445,54 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_vndk_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so", + ], + shared_libs: [ + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "android.hardware.graphics.bufferqueue@2.0", + "android.hardware.graphics.common@1.2", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", + "android.hardware.media.bufferpool@2.0", + "android.hardware.media.bufferpool2-V2-ndk", + "android.hardware.media.c2-V1-ndk", + "libbase", + "libbinder_ndk", + "libcutils", + "libdmabufheap", + "libfmq", + "libgralloctypes", + "libhidlbase", + "libion", + "liblog", + "libnativewindow", + "libstagefright_foundation", + "libstagefright_bufferpool@2.0.1", + "libstagefright_aidl_bufferpool2", + "libui", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_vpp_AIMEMC_plugin", owner: "xiaomi", @@ -5247,6 +5326,33 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcppcose_rkp_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcppcose_rkp_prebuilt.so", + ], + shared_libs: [ + "libcppbor", + "libcrypto", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcustom_nvram", owner: "xiaomi", @@ -6538,6 +6644,79 @@ 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: [ + "libkeymint_shim", + "android.hardware.security.keymint-V3-ndk", + "libbase", + "libbinder_ndk", + "libcppbor", + "libcppcose_rkp_prebuilt", + "libcrypto", + "libkeymaster_portable", + "libjsoncpp", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libladder", owner: "xiaomi", @@ -19241,7 +19420,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libmnl", + name: "libmnld", owner: "xiaomi", strip: { none: true, @@ -19249,7 +19428,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/mt6899/libmnl.so", + "proprietary/vendor/lib64/mt6899/libmnld.so", ], shared_libs: [ "libc++", @@ -34552,12 +34731,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", + "libkeymint_support_V3", "android.hardware.security.keymint-V3-ndk-v35", - "libkeymint_remote_prov_support", + "libkeymint_remote_prov_support_V3", "libbase", "libbinder", "android.hardware.secure_element-V1-ndk", @@ -35786,14 +35965,6 @@ cc_prebuilt_binary { soc_specific: true, } -sh_binary { - name: "chipinfo", - owner: "xiaomi", - src: "proprietary/vendor/bin/chipinfo", - filename: "chipinfo", - soc_specific: true, -} - cc_prebuilt_binary { name: "conninfra_loader", owner: "xiaomi", @@ -36090,6 +36261,55 @@ cc_prebuilt_binary { soc_specific: true, } +cc_prebuilt_binary { + name: "android.hardware.media.c2-mediatek-64b", + owner: "xiaomi", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b", + ], + shared_libs: [ + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libcodec2_hal_common", + "libcodec2_aidl_prebuilt", + "libbase", + "liblog", + "libcodec2", + "libutils", + "android.hardware.media.c2@1.0", + "android.hardware.media.c2@1.1", + "android.hardware.media.c2@1.2", + "libcodec2_hidl@1.0", + "libcodec2_hidl@1.1", + "libcodec2_hidl@1.2", + "libcodec2_vndk", + "libhidlbase", + "libcutils", + "libavservices_minijail", + "libbinder", + "libbinder_ndk", + "libcodec2_mtk_c2store", + "libcodec2_mtk_vdec", + "libcodec2_mtk_venc", + "android.hardware.media.c2-V1-ndk", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} + cc_prebuilt_binary { name: "android.hardware.neuralnetworks-shim-service-mtk", owner: "xiaomi", @@ -36173,13 +36393,13 @@ cc_prebuilt_binary { "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", @@ -36876,7 +37096,7 @@ cc_prebuilt_binary { "proprietary/vendor/bin/mnld", ], shared_libs: [ - "libmnl", + "libmnld", "libcurl", "libcutils", "libnvram", @@ -37302,202 +37522,6 @@ cc_prebuilt_binary { system_ext_specific: true, } -cc_prebuilt_binary { - name: "spkcal", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libcutils", - "libutils", - "libandroid_runtime", - "libnativehelper", - "libaudioclient", - "libmediandk", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libtinyalsa", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_binary { - name: "spkcal_88263s", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_88263s", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_binary { - name: "spkcal_88263s_m16", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_88263s_m16", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_binary { - name: "spkcal_88263s_m9", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_88263s_m9", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_binary { - name: "spkcal_88263s_n12", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_88263s_n12", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - -cc_prebuilt_binary { - name: "spkcal_88263s_n12a", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_88263s_n12a", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_binary { name: "spkcal_88263s_o10", owner: "xiaomi", @@ -37530,39 +37554,6 @@ cc_prebuilt_binary { system_ext_specific: true, } -cc_prebuilt_binary { - name: "spkcal_tfa", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/system_ext/bin/spkcal_tfa", - ], - shared_libs: [ - "libstagefright", - "liblog", - "libutils", - "libbinder", - "libstagefright_foundation", - "libmedia", - "libcutils", - "libtfa98xx_cal", - "libaudioclient", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - system_ext_specific: true, -} - cc_prebuilt_binary { name: "vtservice", owner: "xiaomi", @@ -39839,10 +39830,10 @@ install_symlink { } install_symlink { - name: "vendor_lib64_libmnl_so", + name: "vendor_lib64_libmnld_so", soc_specific: true, - installed_location: "lib64/libmnl.so", - symlink_target: "/vendor/lib64/mt6899/libmnl.so", + installed_location: "lib64/libmnld.so", + symlink_target: "/vendor/lib64/mt6899/libmnld.so", } install_symlink { diff --git a/proprietary/odm/lib64/libmt_mitee.so b/proprietary/odm/lib64/libmt_mitee.so index 0b4db26..9838a7f 100644 Binary files a/proprietary/odm/lib64/libmt_mitee.so and b/proprietary/odm/lib64/libmt_mitee.so differ diff --git a/proprietary/system_ext/bin/spkcal_88263s b/proprietary/system_ext/bin/spkcal_88263s deleted file mode 100755 index b52c668..0000000 Binary files a/proprietary/system_ext/bin/spkcal_88263s and /dev/null differ diff --git a/proprietary/system_ext/bin/spkcal_88263s_m16 b/proprietary/system_ext/bin/spkcal_88263s_m16 deleted file mode 100755 index 34fc198..0000000 Binary files a/proprietary/system_ext/bin/spkcal_88263s_m16 and /dev/null differ diff --git a/proprietary/system_ext/bin/spkcal_88263s_m9 b/proprietary/system_ext/bin/spkcal_88263s_m9 deleted file mode 100755 index da9ec95..0000000 Binary files a/proprietary/system_ext/bin/spkcal_88263s_m9 and /dev/null differ diff --git a/proprietary/system_ext/bin/spkcal_88263s_n12 b/proprietary/system_ext/bin/spkcal_88263s_n12 deleted file mode 100755 index 55f4019..0000000 Binary files a/proprietary/system_ext/bin/spkcal_88263s_n12 and /dev/null differ diff --git a/proprietary/system_ext/bin/spkcal_88263s_n12a b/proprietary/system_ext/bin/spkcal_88263s_n12a deleted file mode 100755 index 000a496..0000000 Binary files a/proprietary/system_ext/bin/spkcal_88263s_n12a and /dev/null differ diff --git a/proprietary/system_ext/bin/spkcal_tfa b/proprietary/system_ext/bin/spkcal_tfa deleted file mode 100755 index a05aace..0000000 Binary files a/proprietary/system_ext/bin/spkcal_tfa and /dev/null differ diff --git a/proprietary/system_ext/priv-app/ImsService/ImsService.apk b/proprietary/system_ext/priv-app/ImsService/ImsService.apk index 0662419..173e5eb 100644 Binary files a/proprietary/system_ext/priv-app/ImsService/ImsService.apk and b/proprietary/system_ext/priv-app/ImsService/ImsService.apk differ diff --git a/proprietary/vendor/bin/chipinfo b/proprietary/vendor/bin/chipinfo deleted file mode 100755 index 2e91a1e..0000000 --- a/proprietary/vendor/bin/chipinfo +++ /dev/null @@ -1,31 +0,0 @@ -#!/vendor/bin/sh - -default_fact_prop=$(getprop ro.soc.manufacturer) - -if [ "$default_fact_prop" == "" ]; then - fact_val=$(cat /sys/devices/soc0/family) - /vendor/bin/setprop ro.vendor.soc.manufacturer ${fact_val} -fi - -default_soc_prop=$(getprop ro.soc.model) - -if [ "$default_soc_prop" == "" ]; then - soc_val=$(cat /sys/devices/soc0/soc_id) - /vendor/bin/setprop ro.vendor.soc.model ${soc_val} -else - soc_val="$default_soc_prop" -fi - -soc_ext_val=$(cat /proc/device-tree/model-external-name 2>/dev/null) -if [ -z "$soc_ext_val" ]; then - soc_ext_val=${soc_val} -fi -/vendor/bin/setprop ro.vendor.soc.model.external_name ${soc_ext_val} - -soc_part_val=$(cat /proc/device-tree/model-part-name 2>/dev/null) -if [ -z "$soc_part_val" ]; then - soc_part_val=${soc_val} -fi -/vendor/bin/setprop ro.vendor.soc.model.part_name ${soc_part_val} - -/vendor/bin/setprop ro.vendor.soc.model_ready 1 diff --git a/proprietary/system_ext/bin/spkcal b/proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b similarity index 50% rename from proprietary/system_ext/bin/spkcal rename to proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b index 2652af6..659ab8f 100755 Binary files a/proprietary/system_ext/bin/spkcal and b/proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b 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 8a840d1..be1b923 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/bin/mnld b/proprietary/vendor/bin/mnld index 5daad2f..de354f6 100755 Binary files a/proprietary/vendor/bin/mnld and b/proprietary/vendor/bin/mnld differ diff --git a/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc b/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc new file mode 100644 index 0000000..0cc2b20 --- /dev/null +++ b/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc @@ -0,0 +1,7 @@ +service android-hardware-media-c2-hal /vendor/bin/hw/android.hardware.media.c2-mediatek-64b + class hal + user mediacodec + group camera drmrpc mediadrm media_rw sdcard_rw media system audio inet net_bt net_bt_admin net_bw_acct sdcard_r + ioprio rt 4 + task_profiles ProcessCapacityHigh HighPerformance + diff --git a/proprietary/vendor/etc/init/chipinfo_init.rc b/proprietary/vendor/etc/init/chipinfo_init.rc deleted file mode 100644 index 708c1ef..0000000 --- a/proprietary/vendor/etc/init/chipinfo_init.rc +++ /dev/null @@ -1,7 +0,0 @@ -on early-init - exec_background - system system -- /vendor/bin/chipinfo - -on post-fs-data - wait_for_prop ro.vendor.soc.model_ready 1 - setprop ro.soc.model ${ro.vendor.soc.model} - setprop ro.soc.manufacturer ${ro.vendor.soc.manufacturer} \ No newline at end of file diff --git a/proprietary/vendor/etc/mtk_platform_codecs_config.xml b/proprietary/vendor/etc/mtk_platform_codecs_config.xml new file mode 100644 index 0000000..a6322d5 --- /dev/null +++ b/proprietary/vendor/etc/mtk_platform_codecs_config.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + diff --git a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy new file mode 100644 index 0000000..e0b3dd9 --- /dev/null +++ b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy @@ -0,0 +1,44 @@ +connect: 1 +fcntl64: 1 +socket: 1 +writev: 1 +clock_nanosleep: 1 +eventfd2: 1 +sched_getparam: 1 +sched_getscheduler :1 +setsockopt: 1 +bind: 1 +listen: 1 + +# Add more for 32bits process, from android.hardware.media.c2@1.1-default-arm.policy +mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE +ftruncate64: 1 +getuid32: 1 +open: 1 +fstat64: 1 +readlink: 1 +fstatfs64: 1 +_llseek: 1 +fstatat64: 1 +ugetrlimit: 1 +# crash dump policy additions +sigreturn: 1 +futex: 1 +#mmap2: arg2 in 0x1|0x2 +geteuid32: 1 +getgid32: 1 +getegid32: 1 +getgroups32: 1 +getpriority: 1 +mlock: 1 +munlock: 1 +fchmod: 1 +getuid: 1 +mmap: 1 +getrlimit: 1 +newfstatat: 1 +fstat: 1 +fstatfs: 1 +unlinkat: 1 +sched_setscheduler: 1 +mkdirat: 1 diff --git a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy new file mode 100644 index 0000000..3c3b4fb --- /dev/null +++ b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy @@ -0,0 +1,88 @@ +# Copyright (C) 2019 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +futex: 1 +# ioctl calls are filtered via the selinux policy. +ioctl: 1 +sched_yield: 1 +close: 1 +dup: 1 +ppoll: 1 +mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE +mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE +getuid: 1 +getrlimit: 1 +fstat: 1 +newfstatat: 1 +fstatfs: 1 +memfd_create: 1 +ftruncate: 1 + +# mremap: Ensure |flags| are (MREMAP_MAYMOVE | MREMAP_FIXED) TODO: Once minijail +# parser support for '<' is in this needs to be modified to also prevent +# |old_address| and |new_address| from touching the exception vector page, which +# on ARM is statically loaded at 0xffff 0000. See +# http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0211h/Babfeega.html +# for more details. +mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE +munmap: 1 +prctl: 1 +writev: 1 +sigaltstack: 1 +clone: 1 +exit: 1 +lseek: 1 +rt_sigprocmask: 1 +openat: 1 +write: 1 +nanosleep: 1 +setpriority: 1 +set_tid_address: 1 +getdents64: 1 +readlinkat: 1 +read: 1 +pread64: 1 +gettimeofday: 1 +faccessat: 1 +exit_group: 1 +restart_syscall: 1 +rt_sigreturn: 1 +getrandom: 1 +madvise: 1 +sched_setaffinity: 1 +sched_getaffinity: 1 +sched_getparam: 1 +sched_getscheduler: 1 +recvfrom: 1 + +# crash dump policy additions +clock_gettime: 1 +getpid: 1 +gettid: 1 +pipe2: 1 +recvmsg: 1 +process_vm_readv: 1 +tgkill: 1 +rt_sigaction: 1 +rt_tgsigqueueinfo: 1 +#mprotect: arg2 in 0x1|0x2 +munmap: 1 +#mmap: arg2 in 0x1|0x2 +geteuid: 1 +getgid: 1 +getegid: 1 +getgroups: 1 +unlinkat: 1 +sched_setscheduler: 1 +mkdirat: 1 diff --git a/proprietary/vendor/lib64/android.frameworks.displayservice@1.0.so b/proprietary/vendor/lib64/android.frameworks.displayservice@1.0.so new file mode 100644 index 0000000..2421b97 Binary files /dev/null and b/proprietary/vendor/lib64/android.frameworks.displayservice@1.0.so differ diff --git a/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so b/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so new file mode 100644 index 0000000..cc7c94d Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so b/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so new file mode 100644 index 0000000..b2aa74c Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so b/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so new file mode 100644 index 0000000..8abe805 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so b/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so new file mode 100644 index 0000000..3ef8693 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libcppcose_rkp_prebuilt.so b/proprietary/vendor/lib64/libcppcose_rkp_prebuilt.so new file mode 100644 index 0000000..2ab0ee7 Binary files /dev/null and b/proprietary/vendor/lib64/libcppcose_rkp_prebuilt.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..3825be3 Binary files /dev/null and b/proprietary/vendor/lib64/libkeymint_remote_prov_support_V3.so differ diff --git a/proprietary/vendor/lib64/mt6899/libmnl.so b/proprietary/vendor/lib64/mt6899/libmnld.so similarity index 98% rename from proprietary/vendor/lib64/mt6899/libmnl.so rename to proprietary/vendor/lib64/mt6899/libmnld.so index 5c687be..ee32ea9 100644 Binary files a/proprietary/vendor/lib64/mt6899/libmnl.so and b/proprietary/vendor/lib64/mt6899/libmnld.so differ diff --git a/rodin-vendor.mk b/rodin-vendor.mk index e4cee13..7c95e71 100644 --- a/rodin-vendor.mk +++ b/rodin-vendor.mk @@ -528,13 +528,13 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.gnss-service.mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss-service.mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.graphics.composer@3.3-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.composer@3.3-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.identity@5.0-service.mitee.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.identity@5.0-service.mitee.rc \ + vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.media.c2-mediatek-64b.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.security.keymint.mitee@3.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint.mitee@3.0-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.tetheroffload-V1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.tetheroffload-V1-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/arm.mali.platform-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/arm.mali.platform-mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \ - vendor/xiaomi/rodin/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/dms-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dms-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \ @@ -570,6 +570,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/mali_platform.config:$(TARGET_COPY_OUT_VENDOR)/etc/mali_platform.config \ vendor/xiaomi/rodin/proprietary/vendor/etc/media_codecs_dolby_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_dolby_audio.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ + vendor/xiaomi/rodin/proprietary/vendor/etc/mtk_platform_codecs_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mtk_platform_codecs_config.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/nhw:$(TARGET_COPY_OUT_VENDOR)/etc/nhw \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/cam_aimemc/camera_memc_30to60.dla:$(TARGET_COPY_OUT_VENDOR)/etc/nn/cam_aimemc/camera_memc_30to60.dla \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/cam_aimemc/camera_memc_resizer_1080p_afbc_nv12.dla:$(TARGET_COPY_OUT_VENDOR)/etc/nn/cam_aimemc/camera_memc_resizer_1080p_afbc_nv12.dla \ @@ -661,6 +662,8 @@ PRODUCT_COPY_FILES += \ 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 \ + vendor/xiaomi/rodin/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy \ + vendor/xiaomi/rodin/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy \ vendor/xiaomi/rodin/proprietary/vendor/etc/sensor_diag.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sensor_diag.cfg \ vendor/xiaomi/rodin/proprietary/vendor/etc/slp_conf:$(TARGET_COPY_OUT_VENDOR)/etc/slp_conf \ vendor/xiaomi/rodin/proprietary/vendor/etc/smartpa_param/AW_DSP.bin:$(TARGET_COPY_OUT_VENDOR)/etc/smartpa_param/AW_DSP.bin \ @@ -808,6 +811,7 @@ PRODUCT_PACKAGES += \ av-audio-types-aidl-V3-ndk \ APUWareApusysAidlServer \ APUWareUtilsAidlServer \ + android.frameworks.displayservice@1.0 \ android.hardware.audio.core-impl-mediatek \ android.hardware.bluetooth.audio-impl-mediatek \ android.hardware.security.keymint-V3-ndk-v35 \ @@ -936,13 +940,17 @@ PRODUCT_PACKAGES += \ libccci_util \ libcmdl \ libcmdl_ndk.mtk.vndk \ + libcodec2_aidl_prebuilt \ libcodec2_fsr \ + libcodec2_hal_common_prebuilt \ + libcodec2_hidl_plugin_prebuilt \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ libcodec2_mtk_venc \ libcodec2_soft_ac4dec \ libcodec2_soft_ddpdec \ libcodec2_store_dolby \ + libcodec2_vndk_prebuilt \ libcodec2_vpp_AIMEMC_plugin \ libcodec2_vpp_AISR_plugin \ libcodec2_vpp_fa_plugin \ @@ -967,6 +975,7 @@ PRODUCT_PACKAGES += \ libcom.xiaomi.signaltrigger \ libcomposer_ext \ libconnfem \ + libcppcose_rkp_prebuilt \ libcustom_nvram \ libcvsd_mtk \ libdapparamstorage \ @@ -1012,6 +1021,8 @@ PRODUCT_PACKAGES += \ libjpeg-alpha_vendor \ libjpegdecoder_rodin \ libjpegencoder_rodin \ + libkeymint_V3 \ + libkeymint_remote_prov_support_V3 \ libladder \ libmbrainSDKv \ libmcve \ @@ -1409,7 +1420,7 @@ PRODUCT_PACKAGES += \ libmmagent \ libmml \ libmmlpqImpl \ - libmnl \ + libmnld \ libmtk_mali_utils \ libmtkcam.atmseventmgr \ libmtkcam.debugwrapper \ @@ -1946,7 +1957,6 @@ PRODUCT_PACKAGES += \ cameratest \ ccci_mdinit \ ccci_rpcd \ - chipinfo \ conninfra_loader \ displayfeature \ fuelgauged \ @@ -1956,6 +1966,7 @@ PRODUCT_PACKAGES += \ android.hardware.gnss-service.mediatek \ android.hardware.graphics.composer@3.3-service \ android.hardware.identity-service.mitee@5.0 \ + android.hardware.media.c2-mediatek-64b \ android.hardware.neuralnetworks-shim-service-mtk \ android.hardware.secure_element@1.2-service-mediatek \ android.hardware.security.keymint@3.0-service.mitee \ @@ -1993,14 +2004,7 @@ PRODUCT_PACKAGES += \ wmt_launcher \ wmt_loader \ android.hardware.audio.parameter_parser.service \ - spkcal \ - spkcal_88263s \ - spkcal_88263s_m16 \ - spkcal_88263s_m9 \ - spkcal_88263s_n12 \ - spkcal_88263s_n12a \ spkcal_88263s_o10 \ - spkcal_tfa \ vtservice \ fidoca_mitee \ vendor.xiaomi.hw.touchfeature-service \ @@ -2297,7 +2301,7 @@ PRODUCT_PACKAGES += \ vendor_lib64_libmmagent_so \ vendor_lib64_libmml_so \ vendor_lib64_libmmlpqImpl_so \ - vendor_lib64_libmnl_so \ + vendor_lib64_libmnld_so \ vendor_lib64_libmtk_mali_utils_so \ vendor_lib64_libmtkcam_atmseventmgr_so \ vendor_lib64_libmtkcam_debugwrapper_so \