Append _system to conflicting system libs

Change-Id: I74306c87e12079204223caccc0c77eacd4e01ec0
This commit is contained in:
Sebastiano Barezzi 2024-09-07 11:59:09 +01:00 committed by Giovanni Ricca
parent 09cefd1963
commit fb7099a911
No known key found for this signature in database
2 changed files with 22 additions and 1 deletions

View File

@ -4,6 +4,6 @@ product/priv-app/MiuiCamera/MiuiCamera.apk:system/priv-app/MiuiCamera/MiuiCamera
system_ext/lib64/libcamera_algoup_jni.xiaomi.so:system/lib64/libcamera_algoup_jni.xiaomi.so
system_ext/lib64/libcamera_mianode_jni.xiaomi.so:system/lib64/libcamera_mianode_jni.xiaomi.so
system_ext/lib64/libmicampostproc_client.so:system/lib64/libmicampostproc_client.so
system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so
system_ext/lib64/vendor.xiaomi.hardware.campostproc@1.0.so:system/lib64/vendor.xiaomi.hardware.campostproc@1.0.so;MODULE=vendor.xiaomi.hardware.campostproc@1.0_system
vendor/etc/camera/st_license.lic
vendor/etc/camera/st_license.lic:vendor/etc/camera/camera_cnf.txt

View File

@ -31,6 +31,27 @@ function vendor_imports() {
EOF
}
function lib_to_package_fixup_vendor_variants() {
if [ "$2" != "system" ]; then
return 1
fi
case "$1" in
vendor.xiaomi.hardware.campostproc@1.0)
echo "${1}_system"
;;
*)
return 1
;;
esac
}
function lib_to_package_fixup() {
lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
lib_to_package_fixup_proto_3_9_1 "$1" ||
lib_to_package_fixup_vendor_variants "$@"
}
# Initialize the helper
setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"