MiuiCamera: Import 32bit misys prebuilts & append _system suffix

- Import all missing 32bit prebuilts which are required by sybsystem libs
- Append _system to conflicting system libs

Inspired from sm8250-common: Append _vendor to conflicting vendor libs [a2d1f54ae9]

Co-authored-by: Sebastiano Barezzi <seba@sebaubuntu.dev>
This commit is contained in:
johnmart19
2024-10-08 01:47:38 +03:00
parent c203475214
commit adab7e9510
19 changed files with 304 additions and 202 deletions

View File

@@ -17,6 +17,110 @@ soong_namespace {
],
}
cc_prebuilt_library_shared {
name: "libmisys_jni.xiaomi",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system/lib/libmisys_jni.xiaomi.so"],
shared_libs: ["liblog", "libutils", "libcutils", "libnativehelper", "libhidlmemory", "libhidlbase", "libhidltransport", "android.hidl.memory@1.0", "android.hidl.allocator@1.0", "vendor.xiaomi.hardware.misys@1.0_system", "vendor.xiaomi.hardware.misys@2.0_system", "vendor.xiaomi.hardware.misys@3.0_system", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/system/lib64/libmisys_jni.xiaomi.so"],
shared_libs: ["liblog", "libutils", "libcutils", "libnativehelper", "libhidlmemory", "libhidlbase", "libhidltransport", "android.hidl.memory@1.0", "android.hidl.allocator@1.0", "vendor.xiaomi.hardware.misys@1.0_system", "vendor.xiaomi.hardware.misys@2.0_system", "vendor.xiaomi.hardware.misys@3.0_system", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@1.0_system",
stem: "vendor.xiaomi.hardware.misys@1.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system/lib/vendor.xiaomi.hardware.misys@1.0.so"],
shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@1.0.so"],
shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@2.0_system",
stem: "vendor.xiaomi.hardware.misys@2.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system/lib/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@3.0_system",
stem: "vendor.xiaomi.hardware.misys@3.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system/lib/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@4.0_system",
stem: "vendor.xiaomi.hardware.misys@4.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/system/lib/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0_system", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
}
cc_prebuilt_library_shared {
name: "libcamera_algoup_jni.xiaomi",
owner: "xiaomi",
@@ -65,22 +169,6 @@ cc_prebuilt_library_shared {
prefer: true,
}
cc_prebuilt_library_shared {
name: "libmisys_jni.xiaomi",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/system/lib64/libmisys_jni.xiaomi.so"],
shared_libs: ["liblog", "libutils", "libcutils", "libnativehelper", "libhidlmemory", "libhidlbase", "libhidltransport", "android.hidl.memory@1.0", "android.hidl.allocator@1.0", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@2.0", "vendor.xiaomi.hardware.misys@3.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.campostproc@1.0",
owner: "xiaomi",
@@ -97,70 +185,6 @@ cc_prebuilt_library_shared {
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@1.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@1.0.so"],
shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@2.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@3.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@4.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/system/lib64/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@1.0-impl",
owner: "xiaomi",
@@ -168,12 +192,16 @@ cc_prebuilt_library_shared {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@1.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@1.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
compile_multilib: "both",
relative_install_path: "hw",
prefer: true,
soc_specific: true,
@@ -186,12 +214,16 @@ cc_prebuilt_library_shared {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@2.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@2.0", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@2.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@2.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
compile_multilib: "both",
relative_install_path: "hw",
prefer: true,
soc_specific: true,
@@ -204,12 +236,16 @@ cc_prebuilt_library_shared {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@3.0-impl.so"],
shared_libs: ["libhidlbase", "libcutils", "libutils", "liblog", "libcheckpid", "liblogwrap_vendor", "libhidlmemory", "vendor.xiaomi.hardware.misys@3.0", "android.hidl.memory@1.0", "android.hidl.allocator@1.0", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@3.0-impl.so"],
shared_libs: ["libhidlbase", "libcutils", "libutils", "liblog", "libcheckpid", "liblogwrap_vendor", "libhidlmemory", "vendor.xiaomi.hardware.misys@3.0", "android.hidl.memory@1.0", "android.hidl.allocator@1.0", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
compile_multilib: "both",
relative_install_path: "hw",
prefer: true,
soc_specific: true,
@@ -222,17 +258,147 @@ cc_prebuilt_library_shared {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/hw/vendor.xiaomi.hardware.misys@4.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@4.0", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/hw/vendor.xiaomi.hardware.misys@4.0-impl.so"],
shared_libs: ["libhidlbase", "libutils", "liblog", "vendor.xiaomi.hardware.misys@1.0", "vendor.xiaomi.hardware.misys@4.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
compile_multilib: "both",
relative_install_path: "hw",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcheckpid",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/libcheckpid.so"],
shared_libs: ["libhidlbase", "libcutils", "libutils", "liblog", "liblogwrap_vendor", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/libcheckpid.so"],
shared_libs: ["libhidlbase", "libcutils", "libutils", "liblog", "liblogwrap_vendor", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "liblogwrap_vendor",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/liblogwrap_vendor.so"],
shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/liblogwrap_vendor.so"],
shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@1.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/vendor.xiaomi.hardware.misys@1.0.so"],
shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@1.0.so"],
shared_libs: ["libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@2.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@3.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@4.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: ["proprietary/vendor/lib/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "lib_sr_models",
owner: "xiaomi",
@@ -284,23 +450,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcheckpid",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/libcheckpid.so"],
shared_libs: ["libhidlbase", "libcutils", "libutils", "liblog", "liblogwrap_vendor", "vendor.xiaomi.hardware.misys@1.0", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libflaw",
owner: "xiaomi",
@@ -318,23 +467,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "liblogwrap_vendor",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/liblogwrap_vendor.so"],
shared_libs: ["libcutils", "liblog", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "librelight_only",
owner: "xiaomi",
@@ -386,74 +518,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@1.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@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: "vendor.xiaomi.hardware.misys@2.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@2.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@3.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@3.0.so"],
shared_libs: ["android.hidl.allocator@1.0", "android.hidl.memory.block@1.0", "android.hidl.memory.token@1.0", "vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "vendor.xiaomi.hardware.misys@4.0",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: ["proprietary/vendor/lib64/vendor.xiaomi.hardware.misys@4.0.so"],
shared_libs: ["vendor.xiaomi.hardware.misys@1.0", "libhidlbase", "liblog", "libutils", "libcutils", "libc++", "libc", "libm", "libdl", ],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libOpenCL_system",
owner: "xiaomi",