rodin: Sync with tree changes

* 52673ea rodin: Switch to source-built chipinfo init
* 5d8528e rodin: Switch back to prebuilt C2
* fa40e0c rodin: Fixup mnld
* e35bf22 rodin: Re-configure prebuilt keymint stack
* cdeb721 rodin: Import prebuilt frameworks displayservice
* 1f9cf66 rodin: Drop unused prebuilt speaker calibration

Change-Id: I1b441c13bdb2a727d82e941ada11e40f4d1cac84
Signed-off-by: Ido <dev.xyzuniverse@gmail.com>
This commit is contained in:
xyzuniverse committed 2026-09-20 22:23:35 +02:00
1 parent d52252fb89
commit 33353fc448
28 files changed
+612 -400

No files matched your search

+342 -351
View File
@@ -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 {