halcyonlv/vendor_xiaomi_miatoll
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "sm6250-common: Import 32 bit CamX libraries"

Browse Source 
This reverts commit e5934107e65b7d9d1716c845c4acffe810c98963.

Even if 32-bit CamX libs were used, they couldn't be loaded because of
missing dependencies (reported by ELF checks).

Change-Id: I9e302e69f4775662e451cb98ac1afa97a108723b
This commit is contained in:
Alexander Winkowski
2025-02-09 16:22:11 +00:00
committed by Giovanni Ricca
parent bfb035c6d8
commit 007c4b816e
8 changed files with 165 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.bp
+159 -240
View File
@@ -906,246 +906,6 @@ cc_prebuilt_library_shared {
soc_specific: true, soc_specific: true,
} }
cc_prebuilt_library_shared {
name: "libcamxfdalgov7",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxfdalgov7.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdalgov7.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxfdalgov8",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxfdalgov8.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdalgov8.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxfdengine",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxfdengine.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libcamera_nn_stub",
"libcdsprpc",
"libcamxfdalgov7",
"libc++",
"libc",
"libm",
"libdl",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdengine.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libcamera_nn_stub",
"libcdsprpc",
"libcamxfdalgov7",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxstatscore",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxstatscore.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxstatscore.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxswprocessalgo",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxswprocessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxswprocessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxtintlessalgo",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm: {
srcs: [
"proprietary/vendor/lib/libcamxtintlessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxtintlessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "both",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "libdiag", name: "libdiag",
owner: "xiaomi", owner: "xiaomi",
@@ -8846,6 +8606,165 @@ cc_prebuilt_library_shared {
soc_specific: true, soc_specific: true,
} }
cc_prebuilt_library_shared {
name: "libcamxfdalgov7",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdalgov7.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxfdalgov8",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdalgov8.so",
],
shared_libs: [
"libc++",
"libdl",
"libc",
"libm",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxfdengine",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxfdengine.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libcamera_nn_stub",
"libcdsprpc",
"libcamxfdalgov7",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxstatscore",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxstatscore.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxswprocessalgo",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxswprocessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared {
name: "libcamxtintlessalgo",
owner: "xiaomi",
strip: {
none: true,
},
target: {
android_arm64: {
srcs: [
"proprietary/vendor/lib64/libcamxtintlessalgo.so",
],
shared_libs: [
"libcutils",
"liblog",
"libsync",
"libc++",
"libc",
"libm",
"libdl",
],
},
},
compile_multilib: "64",
prefer: true,
soc_specific: true,
}
cc_prebuilt_library_shared { cc_prebuilt_library_shared {
name: "libcdfw", name: "libcdfw",
owner: "xiaomi", owner: "xiaomi",
proprietary/vendor/lib/libcamxfdalgov7.so
Vendored
BIN
View File
Binary file not shown.
proprietary/vendor/lib/libcamxfdalgov8.so
Vendored
BIN
View File
Binary file not shown.
proprietary/vendor/lib/libcamxfdengine.so
Vendored
BIN
View File
Binary file not shown.
proprietary/vendor/lib/libcamxstatscore.so
Vendored
BIN
View File
Binary file not shown.
proprietary/vendor/lib/libcamxswprocessalgo.so
Vendored
BIN
View File
Binary file not shown.
proprietary/vendor/lib/libcamxtintlessalgo.so
Vendored
BIN
View File
Binary file not shown.
sm6250-common-vendor.mk
+6 -6
View File
@@ -340,12 +340,6 @@ PRODUCT_PACKAGES += \
libadreno_app_profiles \ libadreno_app_profiles \
libadreno_utils \ libadreno_utils \
libc2d30_bltlib \ libc2d30_bltlib \
libcamxfdalgov7 \
libcamxfdalgov8 \
libcamxfdengine \
libcamxstatscore \
libcamxswprocessalgo \
libcamxtintlessalgo \
libdiag \ libdiag \
libdsutils \ libdsutils \
libgpudataproducer \ libgpudataproducer \
@@ -592,6 +586,12 @@ PRODUCT_PACKAGES += \
libcamera_dirty \ libcamera_dirty \
libcamera_nn_stub \ libcamera_nn_stub \
libcamera_scene \ libcamera_scene \
libcamxfdalgov7 \
libcamxfdalgov8 \
libcamxfdengine \
libcamxstatscore \
libcamxswprocessalgo \
libcamxtintlessalgo \
libcdfw \ libcdfw \
libcdfw_remote_api \ libcdfw_remote_api \
libcdsp_default_listener \ libcdsp_default_listener \